libapitelethon 1.0__tar.gz → 2.0__tar.gz

{libapitelethon-1.0 → libapitelethon-2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: libapitelethon
-Version: 1.0
+Version: 2.0
 Summary: Асинхронный клиент для https://codeberg.org/ourempirecommunity/api_telethon
 Keywords: telegram,api,async,client
 Author: ibrvtk

{libapitelethon-1.0 → libapitelethon-2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "libapitelethon"
-version = "1.0"
+version = "2.0"
 description = "Асинхронный клиент для https://codeberg.org/ourempirecommunity/api_telethon"
 readme = "README.md"
 requires-python = ">=3.14"

{libapitelethon-1.0 → libapitelethon-2.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "libapitelethon"
-version = "1.0"
+version = "2.0"
 description = "Асинхронный клиент для https://codeberg.org/ourempirecommunity/api_telethon"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}

libapitelethon-2.0/src/libapitelethon/client/__init__.py

@@ -0,0 +1,6 @@
+from .api_telethon import ApiTelethonBase
+
+
+__all__: list[str] = (
+    'ApiTelethonBase',
+)

{libapitelethon-1.0 → libapitelethon-2.0}/src/libapitelethon/client/api_telethon.py

@@ -7,10 +7,10 @@ if TYPE_CHECKING:
 
 from aiohttp import ClientSession
 
-from ..exceptions import ApiTelethonException
+from ..exceptions import ApiTelethonHttpError
 
 
-class ApiTelethon:
+class ApiTelethonBase:
     def __init__(
         self,
         protocol: Literal['http', 'https'] = 'http',
@@ -31,7 +31,7 @@ class ApiTelethon:
         else:
             error_message = data['detail'][0]['msg']
 
-        raise ApiTelethonException(error_message)
+        raise ApiTelethonHttpError(error_message)
 
     @staticmethod
     def _return_data(data: dict) -> dict:
@@ -50,28 +50,48 @@ class ApiTelethon:
                 return self._return_data(data)
 
 
-    async def ping(self) -> bool:
+    async def _ping(self) -> bool:
         url: str = self._url
         return await self._request(url)
 
-
-    async def get_user(self, uid: UserIdOrUsername) -> DictUser:
+    async def _get_user(self, uid: UserIdOrUsername) -> DictUser:
         url: str = self._url_user + str(uid)
         return await self._request(url)
 
-    async def get_user_aiogram(self, uid: UserIdOrUsername) -> DictUserAiogram:
-        url: str = self._url_user + str(uid) + '/aiogram'
+    async def _get_user_aiogram(self, uid: UserIdOrUsername) -> DictUserAiogram:
+        url: str = self._url_user + str(uid) + '/' + 'aiogram'
         return await self._request(url)
 
+    async def _get_user_id(self, username: UserUsername) -> UserId:
+        url: str = self._url_user + username + '/' + 'id'
+        return await self._request(url)
 
-    async def get_user_id(self, username: UserUsername) -> UserId:
-        url: str = self._url_user + username + '/id'
+    async def _get_user_username(self, id: UserId) -> UserUsername:
+        url: str = self._url_user + str(id) + '/' + 'username'
         return await self._request(url)
 
-    async def get_user_username(self, id: UserId) -> UserUsername:
-        url: str = self._url_user + str(id) + '/username'
+    async def _get_user_usernames(self, uid: UserIdOrUsername) -> list[UserUsername]:
+        url: str = self._url_user + str(uid) + '/' + 'usernames'
         return await self._request(url)
 
-    async def get_user_usernames(self, uid: UserIdOrUsername) -> list[UserUsername]:
-        url: str = self._url_user + str(uid) + '/usernames'
-        return await self._request(url)
+
+    async def ping(self):
+        return await self._ping()
+
+    async def get_user(self, uid: UserIdOrUsername):
+        return await self._get_user(uid)
+
+    async def get_user_aiogram(self, uid: UserIdOrUsername):
+        return await self._get_user_aiogram(uid)
+
+    async def get_user_id(self, username: UserUsername):
+        return await self._get_user_id(username)
+
+    async def get_user_username(self, id: UserId):
+        return await self._get_user_username(id)
+
+    async def get_user_usernames(self, uid: UserIdOrUsername):
+        return await self._get_user_usernames(uid)
+
+class ApiTelethon(ApiTelethonBase):
+    pass

libapitelethon-2.0/src/libapitelethon/exceptions.py

@@ -0,0 +1,14 @@
+class LibApiTelethonError(Exception):
+    """Base exception for libapitelethon."""
+
+
+class ApiTelethonHttpError(LibApiTelethonError):
+    """Raised when the API returns an error."""
+
+
+class IntegrationNotInstalledError(LibApiTelethonError):
+    """Raised when the optional integration dependency is missing."""
+
+
+# class UserNotFoundError(ApiTelethonHttpError):
+#     """User not found."""

libapitelethon-2.0/src/libapitelethon/integrations/aiogram/__init__.py

@@ -0,0 +1,6 @@
+from .client import ApiTelethonAiogram
+
+
+__all__: list[str] = (
+    'ApiTelethonAiogram',
+)

libapitelethon-2.0/src/libapitelethon/integrations/aiogram/client.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ...types import UserIdOrUsername
+
+from ...exceptions import IntegrationNotInstalledError
+from ...client import ApiTelethonBase
+
+try:
+    from aiogram.types import User
+except ImportError as exc:
+    raise IntegrationNotInstalledError(
+        "Для интеграции c aiogram установите: pip install 'libapitelethon[aiogram]'"
+    ) from exc
+
+
+class ApiTelethonAiogram(ApiTelethonBase):
+    async def get_user_aiogram(self, uid: UserIdOrUsername) -> User:
+        return User(**await self._get_user_aiogram(uid))

libapitelethon-2.0/src/libapitelethon/integrations/telethon/__init__.py

@@ -0,0 +1,6 @@
+from .client import ApiTelethonTelethon
+
+
+__all__: list[str] = (
+    'ApiTelethonTelethon',
+)

libapitelethon-2.0/src/libapitelethon/integrations/telethon/client.py

@@ -0,0 +1,120 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+from datetime import datetime
+
+if TYPE_CHECKING:
+    from ...types import UserIdOrUsername
+    from ...models import DictUser
+
+from ...client import ApiTelethonBase
+from ...exceptions import IntegrationNotInstalledError
+
+try:
+    from telethon.types import User
+    from telethon.types import (
+        UserProfilePhoto,
+        UserStatusOnline, UserStatusOffline, UserStatusRecently, UserStatusEmpty,
+        RestrictionReason,
+        EmojiStatus,
+        Username,
+        PeerColor
+    )
+except ImportError as exc:
+    raise IntegrationNotInstalledError(
+        "Для интеграции c telethon установите: pip install 'libapitelethon[telethon]'"
+    ) from exc
+
+
+class ApiTelethonTelethon(ApiTelethonBase):
+    @staticmethod
+    def _retranslate_data_to_user(data: DictUser) -> User:
+        photo: UserProfilePhoto | None = None
+        status: UserStatusOnline | UserStatusOffline | UserStatusRecently | UserStatusEmpty | None = None
+        restriction_reason: RestrictionReason | None = None
+        emoji_status: EmojiStatus | None = None
+        usernames: list[Username] | None = None
+        color: PeerColor | None = None
+        profile_color: PeerColor | None = None
+
+        if data.get('photo'): photo = UserProfilePhoto(data['photo'], 0)
+
+        status_data = data.get('status')
+        if status_data:
+            status_type = status_data.get('type')
+            if status_type == 'online':
+                status = UserStatusOnline(datetime.fromtimestamp(status_data['expires']))
+            elif status_type == 'offline':
+                status = UserStatusOffline(datetime.fromtimestamp(status_data['was_online']))
+            elif status_type == 'hidden':
+                by_me = status_data.get('by_me', False)
+                # Точно неизвестно, какой из трёх типов был, поэтому ставится Recently
+                status = UserStatusRecently(by_me)
+            elif status_type == 'empty':
+                status = UserStatusEmpty()
+
+        if data.get('restriction_reason'): restriction_reason = [RestrictionReason('all', r, '') for r in data['restriction_reason']]
+
+        if data.get('emoji_status'): emoji_status = EmojiStatus(data['emoji_status'])
+
+        if data.get('usernames'): usernames = [Username(u) for u in data['usernames']]
+
+        if data.get('color'): color = PeerColor(data['color'])
+
+        if data.get('profile_color'): profile_color = PeerColor(data['profile_color'])
+
+        return User(
+            id=data['id'],
+            is_self=data.get('is_self'),
+            contact=data.get('contact'),
+            mutual_contact=data.get('mutual_contact'),
+            deleted=data.get('deleted'),
+            bot=data.get('bot'),
+            bot_chat_history=data.get('bot_chat_history'),
+            bot_nochats=data.get('bot_nochats'),
+            verified=data.get('verified'),
+            restricted=data.get('restricted'),
+            min=data.get('min'),
+            bot_inline_geo=data.get('bot_inline_geo'),
+            support=data.get('support'),
+            scam=data.get('scam'),
+            apply_min_photo=data.get('apply_min_photo'),
+            fake=data.get('fake'),
+            bot_attach_menu=data.get('bot_attach_menu'),
+            premium=data.get('premium'),
+            attach_menu_enabled=data.get('attach_menu_enabled'),
+            bot_can_edit=data.get('bot_can_edit'),
+            close_friend=data.get('close_friend'),
+            stories_hidden=data.get('stories_hidden'),
+            stories_unavailable=data.get('stories_unavailable'),
+            contact_require_premium=data.get('contact_require_premium'),
+            bot_business=data.get('bot_business'),
+            bot_has_main_app=data.get('bot_has_main_app'),
+            bot_forum_view=data.get('bot_forum_view'),
+            bot_forum_can_manage_topics=data.get('bot_forum_can_manage_topics'),
+            bot_can_manage_bots=data.get('bot_can_manage_bots'),
+            bot_guestchat=data.get('bot_guestchat'),
+            bot_guard=data.get('bot_guard'),
+            access_hash=data.get('access_hash'),
+            first_name=data.get('first_name'),
+            last_name=data.get('last_name'),
+            username=data.get('username'),
+            phone=data.get('phone'),
+            photo=photo,
+            status=status,
+            bot_info_version=data.get('bot_info_version'),
+            restriction_reason=restriction_reason,
+            bot_inline_placeholder=data.get('bot_inline_placeholder'),
+            lang_code=data.get('lang_code'),
+            emoji_status=emoji_status,
+            usernames=usernames,
+            stories_max_id=None,
+            color=color,
+            profile_color=profile_color,
+            bot_active_users=data.get('bot_active_users'),
+            bot_verification_icon=data.get('bot_verification_icon'),
+            send_paid_messages_stars=data.get('send_paid_messages_stars'),
+            linked_community_id=data.get('linked_community_id'),
+        )
+
+    async def get_user(self, uid: UserIdOrUsername) -> User:
+        return self._retranslate_data_to_user(await self._get_user(uid))

libapitelethon-1.0/src/libapitelethon/exceptions.py

@@ -1,2 +0,0 @@
-class ApiTelethonException(Exception):
-    pass