botapi-py 1.3.1__tar.gz → 1.3.3__tar.gz

{botapi_py-1.3.1 → botapi_py-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: botapi-py
-Version: 1.3.1
+Version: 1.3.3
 Summary: A simple and flexible Python library to conveniently build Telegram bots using the Bot API.
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pydantic>=2.12.0

{botapi_py-1.3.1 → botapi_py-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "botapi-py"
-version = "1.3.1"
+version = "1.3.3"
 description = "A simple and flexible Python library to conveniently build Telegram bots using the Bot API."
 # readme = "README.md"
 # authors = [

{botapi_py-1.3.1 → botapi_py-1.3.3}/src/botapi/dispatchers/__init__.py

@@ -1,5 +1,8 @@
 from .get_updates_handler import GetUpdatesAsyncDispatcher
-from .redis_pubsub_handler import RedisPubSubAsyncDispatcher
+try:
+	from .redis_pubsub_handler import RedisPubSubAsyncDispatcher
+except ImportError:
+	pass
 
 __all__ = [
 	'GetUpdatesAsyncDispatcher',

{botapi_py-1.3.1 → botapi_py-1.3.3}/src/botapi/dispatchers/get_updates_handler.py

@@ -17,7 +17,7 @@ class GetUpdatesAsyncDispatcher:
 	update_handler: UpdateHandler
 	tasks_shutdown_timeout: float
 	tasks: set[asyncio.Task] # prevent gc from collecting tasks before they finish
-	bot: botapi.api.BotAPI
+	bot: 'botapi.api.BotAPI'
 	reconnect_delay: float
 	allowed_updates: list[str]
 	offset: int
@@ -25,7 +25,7 @@ class GetUpdatesAsyncDispatcher:
 	def __init__(
 		self,
 		update_handler: UpdateHandler,
-		bot: botapi.api.BotAPI,
+		bot: 'botapi.api.BotAPI',
 		allowed_updates: list[str], # botapi.enums.UpdateType
 		reconnect_delay: float = 5,
 		shutdown_wait_timeout: float = 3

{botapi_py-1.3.1 → botapi_py-1.3.3}/src/botapi/dispatchers/redis_pubsub_handler.py

@@ -11,8 +11,9 @@ try:
 	import redis.asyncio as redis
 	from redis.asyncio.client import PubSub
 	_has_redis = True
-except ImportError:
+except ImportError as e:
 	_has_redis = False
+	raise e
 	
 logger = logging.getLogger(__name__)
 

{botapi_py-1.3.1 → botapi_py-1.3.3}/src/botapi/enums.py

@@ -1,6 +1,6 @@
 import enum
+from typing import Union
 
-from . import boilerplate
 
 class ChatType(enum.StrEnum):
 	PRIVATE = 'private'
@@ -102,11 +102,9 @@ class ServiceMessage(enum.StrEnum):
 	WEB_APP_DATA = 'web_app_data'
 	SUGGESTED_POST = 'suggested_post_info'
 	
-@boilerplate.extend_enum(MediaType, ServiceMessage)
-class MessageType(enum.StrEnum):
+class OtherMessageType(enum.StrEnum):
 	'''
-	The content of this message.
-	All of these fields should be mutually exclusive.
+	The type of this message (that does NOT contain multimedia or service content).
 	'''
 	TEXT = 'text'
 	CHECKLIST = 'checklist'
@@ -118,6 +116,18 @@ class MessageType(enum.StrEnum):
 	LOCATION = 'location'
 	CONTACT = 'contact'
 	
+MessageType = Union[
+	MediaType,
+	ServiceMessage,
+	OtherMessageType
+]
+'''
+The type of the **actual** message content.
+
+All of the fields are mutually exclusive, since a message
+can only be of one 'type' at a time.
+'''
+	
 class ChatMemberStatus(enum.StrEnum):
 	'''
 	Statuses of a chat member.

botapi_py-1.3.1/src/botapi/boilerplate.py

@@ -1,20 +0,0 @@
-import enum
-
-from typing import TypeVar, Callable
-
-# Enums
-E = TypeVar('E', bound=enum.Enum)
-
-def extend_enum(*sources: type[E]) -> Callable[..., type[E]]:
-	'''
-	Decorator that extends an Enum class with members
-	from one or more source Enum classes.
-	'''
-	def decorator(target: type[E]) -> type[E]:
-		for source in sources:
-			for member in source:
-				if member.name not in target.__members__:
-					target._member_map_[member.name] = member
-		return target
-	return decorator
-