py-tgcalls 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

{py_tgcalls-1.2.7.dist-info → py_tgcalls-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-tgcalls
-Version: 1.2.7
+Version: 1.2.8
 Summary: UNKNOWN
 Home-page: https://github.com/pytgcalls/pytgcalls
 Author: Laky-64
@@ -22,9 +22,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp (>=3.9.3)
 Requires-Dist: deprecation
-Requires-Dist: ntgcalls (>=1.1.0)
+Requires-Dist: ntgcalls (>=1.1.2)
 Requires-Dist: psutil
 Requires-Dist: screeninfo
+Requires-Dist: setuptools
 
 <img src="https://raw.githubusercontent.com/pytgcalls/pytgcalls/master/.github/images/banner.png" alt="pytgcalls logo" />
 <p align="center">

{py_tgcalls-1.2.7.dist-info → py_tgcalls-1.2.8.dist-info}/RECORD

@@ -1,18 +1,19 @@
 pytgcalls/__init__.py,sha256=MRF45fC5EHvNRJgMHKZEiytlfOidmShTvi5loWD9GPw,261
-pytgcalls/__version__.py,sha256=ZPIeIspmBptDYG5CCWeXrMEitl5VFLx13DZa9qaB4EA,22
+pytgcalls/__version__.py,sha256=qGbXFEJiAOnWJQBRuZoZtO2VVVauuuZtAP1iQd2Gnq4,22
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=7BBRRD_lejYE8bcppkef8I1kiKPnx-O7G6IGDKg0R3Y,3532
 pytgcalls/ffmpeg.py,sha256=-y2Ce-qR8U4vgRD116aWSLFHggRZqxwrjyYb_7s3W8s,8442
-pytgcalls/mtproto_required.py,sha256=04outJTCtqW4B0200NPlO83S4KLheveCxw-cWyh1i74,781
+pytgcalls/mtproto_required.py,sha256=0OJGKrUusF7Z4seYAZpr_xavnux1XWhbgC2szJ_yPPU,494
+pytgcalls/mutex.py,sha256=RfkG2UI-kEzo57P0KHSuU6fgS8BE0UySpWqie5qhMy4,1160
 pytgcalls/pytgcalls.py,sha256=GUKpl3UN0JsvahbJW9oOgUdtMx0-Q_gNSLdV9fdvzRs,930
 pytgcalls/pytgcalls_session.py,sha256=BfqTEWDxH5VC3CHnu5RVVq2y9rUDq57EhNvPkk5wa08,2707
-pytgcalls/scaffold.py,sha256=fjoz6YK4M0UoBlm6se-P83RlBgDnBQncjyHsyRko5wg,794
+pytgcalls/scaffold.py,sha256=-RImO5R-ZAMbieCUktf3REUOu4jEBGsroRMZo5IPKBE,822
 pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/stream_type.py,sha256=-6U3Rbh0Dfr12ZcmU9PVeBQr4AbdJsW2mP74h3SKFG4,733
 pytgcalls/sync.py,sha256=dADzbB94gDZrNIWv3JlVa6u1Ak-TXk3bbr6T7KOVcL0,3252
 pytgcalls/to_async.py,sha256=5aRU2rttq7n_gSFM-nhinVGj15MnnIezKg9OsW8PmjI,531
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
-pytgcalls/ytdlp.py,sha256=JsQWS5mYKJ88_8-zuxn8EnagrcASNrNHNES1xHunDjU,1806
+pytgcalls/ytdlp.py,sha256=TyiorAgg8k6Nx04iv-tYK-3AGHdDl_BIFTZgbXHr5ME,1835
 pytgcalls/custom_api/__init__.py,sha256=ZT8d0lc2YrDuw_YSFAXXHHMewoXGFZ-ANOBIAr0vGFQ,60
 pytgcalls/custom_api/custom_api.py,sha256=Ko3aS6psrwPmOhRPxvG0fepXt4STrA0StvINSxz4Cj8,1890
 pytgcalls/handlers/__init__.py,sha256=pubbxI4pLqQpAKf8-toD6ija4cpSvbCJOQFjTiDjX1E,75
@@ -32,10 +33,10 @@ pytgcalls/methods/decorators/on_stream_end.py,sha256=IHsGgrWXWS6kg2K6x6u2aZMpo2a
 pytgcalls/methods/groups/__init__.py,sha256=GX1LPgUKEZOrSz7zWD9pR0OPWHO_4jcMdqXTDGQf5JA,293
 pytgcalls/methods/groups/change_volume_call.py,sha256=1qciR48hRdDwERomOPEUGcQ43Q2zRtNdBgF2JDs-w6c,720
 pytgcalls/methods/groups/get_participants.py,sha256=Tjpb9ZWRJGJZioZ7Z7dpOcmEexwEqfgUfvcsqxMNW2Y,631
-pytgcalls/methods/groups/join_group_call.py,sha256=4J-IpyedSIQNN3mg68homyv6MNdYaJQ1V8ARrbKhTpw,3240
-pytgcalls/methods/groups/leave_group_call.py,sha256=BmpKSAo3vaYXIpEIu1jaYUdo2TUb4XEJYKVEzXbOs4s,985
+pytgcalls/methods/groups/join_group_call.py,sha256=-A0iKqCKsDm3pUhl5bPJ3NVnSy3JIF9zLNaO_zZ77ro,3705
+pytgcalls/methods/groups/leave_group_call.py,sha256=Mu3PHw5s1v7rmeqwngqR3IwamddIa3Q_NmR6_cWC0iY,1023
 pytgcalls/methods/stream/__init__.py,sha256=Go0xKnzPLfB8c3lwCqyifk496E7jkcIZBmzYO0XbH0A,368
-pytgcalls/methods/stream/change_stream.py,sha256=KdquY2feZdjhtHQeJtWJO2cuIYvYvMkk6Sjykio7XZ8,997
+pytgcalls/methods/stream/change_stream.py,sha256=UmolBavQdzbY1YS3t_aT-tEK3EvFbTlQguonUa4cVzc,1035
 pytgcalls/methods/stream/mute_stream.py,sha256=9R8ctu8zeMmqkdrbUq01Ni7tm0cM6Y8bM6auP8NIXqI,669
 pytgcalls/methods/stream/pause_stream.py,sha256=9a-P3HZOkxbnesi4f-pPIeUQaGhlFlJIPN7pqZljo2g,672
 pytgcalls/methods/stream/played_time.py,sha256=zkuGgEg8DmovnIf-vddv3A0m5fMv_goX6n8N2RP-fyk,669
@@ -50,7 +51,7 @@ pytgcalls/methods/utilities/mtproto_handler.py,sha256=pdX29BJDPsdB9xFLRZt41Lc1OX
 pytgcalls/methods/utilities/ping.py,sha256=pIraQyVd-fJDAdEnuD5MHBgFhXxN8-6yl2TV68aw6AA,295
 pytgcalls/methods/utilities/resolve_chat_id.py,sha256=6m-oXfJy1_iHz_7UWsmRYgDLK6IFoO1-I2I7CC9ytks,383
 pytgcalls/methods/utilities/run.py,sha256=cnYQd2xB5Cr_WS0Q2cXJZPGiN6JOCULzj1r4xXVyrlg,152
-pytgcalls/methods/utilities/start.py,sha256=l_hOnswgxIP5uSLGOwePepoM3ghd9fWGxq1Rk8Vt020,4626
+pytgcalls/methods/utilities/start.py,sha256=9f4IIliv1sPlwlm8tr-ABaIfXwobh6YOITClaJXeS9Q,4492
 pytgcalls/methods/utilities/stream_params.py,sha256=hYcNxx__McmPeHgOUDEuNcN7ThgDjukejQYHrfmWm-A,1519
 pytgcalls/mtproto/__init__.py,sha256=X4zvzFG7km7qHyE0fdvA550WcOVO_xl_p__gvIfDGmw,130
 pytgcalls/mtproto/bridged_client.py,sha256=EW379VjMadbMm7gle35OWIfXdpPrF0ZszMc8r5YZi5k,4746
@@ -104,8 +105,8 @@ pytgcalls/types/stream/legacy/quality/low_quality_audio.py,sha256=sa7SpkDa17SIql
 pytgcalls/types/stream/legacy/quality/low_quality_video.py,sha256=87_c1ULPqkrafNxD1YOSlQZFJSty6PqkuT0arFRgXAo,342
 pytgcalls/types/stream/legacy/quality/medium_quality_audio.py,sha256=vcMX4c4MA0t56Ch89lIFEeLe4nlFtI6_DllYlZAVbwM,344
 pytgcalls/types/stream/legacy/quality/medium_quality_video.py,sha256=xUZf2Uclipd1IWgX0rE82kNt5vBqoVwqRdoxQiTL7yA,345
-py_tgcalls-1.2.7.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-1.2.7.dist-info/METADATA,sha256=cFXimZ6bmz1_lXGRhWlhRzSPnqCKZf5xavTsZ17YNU8,4854
-py_tgcalls-1.2.7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-py_tgcalls-1.2.7.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-1.2.7.dist-info/RECORD,,
+py_tgcalls-1.2.8.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-1.2.8.dist-info/METADATA,sha256=sCyK2i9woc46OCbuACCKFI-J6Qy1Vr45qiX-P7-FVDk,4880
+py_tgcalls-1.2.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+py_tgcalls-1.2.8.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-1.2.8.dist-info/RECORD,,

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '1.2.7'
+__version__ = '1.2.8'

pytgcalls/methods/groups/join_group_call.py

@@ -4,6 +4,7 @@ from typing import Optional
 from typing import Union
 
 from ntgcalls import ConnectionError
+from ntgcalls import ConnectionNotFound
 from ntgcalls import FileError
 from ntgcalls import InvalidParams
 from ntgcalls import TelegramServerError
@@ -13,6 +14,7 @@ from ...exceptions import NoActiveGroupCall
 from ...exceptions import UnMuteNeeded
 from ...mtproto import BridgedClient
 from ...mtproto_required import mtproto_required
+from ...mutex import mutex
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
 from ...to_async import ToAsync
@@ -23,6 +25,7 @@ py_logger = logging.getLogger('pytgcalls')
 
 
 class JoinGroupCall(Scaffold):
+    @mutex
     @statictypes
     @mtproto_required
     async def join_group_call(
@@ -78,11 +81,19 @@ class JoinGroupCall(Scaffold):
                 except TelegramServerError:
                     if retries == 3:
                         raise
-                    if retries >= 1:
-                        py_logger.warning(
-                            f'Telegram is having some internal server issues. '
-                            f'Retrying {retries + 1} of 3',
+                    (py_logger.warning if retries >= 1 else py_logger.info)(
+                        f'Telegram is having some internal server issues. '
+                        f'Retrying {retries + 1} of 3',
+                    )
+                except Exception:
+                    try:
+                        await ToAsync(
+                            self._binding.stop,
+                            chat_id,
                         )
+                    except ConnectionNotFound:
+                        pass
+                    raise
 
             participants = await self._app.get_group_call_participants(
                 chat_id,
@@ -99,3 +110,6 @@ class JoinGroupCall(Scaffold):
             raise AlreadyJoinedError()
         except InvalidParams:
             raise UnMuteNeeded()
+        except Exception:
+            self._cache_user_peer.pop(chat_id)
+            raise

pytgcalls/methods/groups/leave_group_call.py

@@ -5,12 +5,14 @@ from ntgcalls import ConnectionNotFound
 from ...exceptions import NoActiveGroupCall
 from ...exceptions import NotInGroupCallError
 from ...mtproto_required import mtproto_required
+from ...mutex import mutex
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
 from ...to_async import ToAsync
 
 
 class LeaveGroupCall(Scaffold):
+    @mutex
     @statictypes
     @mtproto_required
     async def leave_group_call(

pytgcalls/methods/stream/change_stream.py

@@ -6,6 +6,7 @@ from ntgcalls import FileError
 
 from ...exceptions import NotInGroupCallError
 from ...mtproto_required import mtproto_required
+from ...mutex import mutex
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
 from ...to_async import ToAsync
@@ -14,6 +15,7 @@ from ..utilities.stream_params import StreamParams
 
 
 class ChangeStream(Scaffold):
+    @mutex
     @statictypes
     @mtproto_required
     async def change_stream(

pytgcalls/methods/utilities/start.py

@@ -36,13 +36,7 @@ class Start(Scaffold):
             ) == participant.user_id if chat_peer else False
             if is_self:
                 if just_left:
-                    try:
-                        await ToAsync(
-                            self._binding.stop,
-                            chat_id,
-                        )
-                    except ConnectionNotFound:
-                        pass
+                    await clear_call(chat_id)
                 if chat_id in self._need_unmute and \
                         not just_joined and \
                         not just_left and \
@@ -71,8 +65,7 @@ class Start(Scaffold):
                 )
             except ConnectionNotFound:
                 pass
-            self._cache_user_peer.pop(chat_id)
-            self._need_unmute.discard(chat_id)
+            await clear_cache(chat_id)
 
         async def update_status(chat_id: int, state: MediaState):
             try:
@@ -98,6 +91,10 @@ class Start(Scaffold):
                 ),
             )
 
+        async def clear_cache(chat_id: int):
+            self._cache_user_peer.pop(chat_id)
+            self._need_unmute.discard(chat_id)
+
         if not self._is_running:
             self._is_running = True
             self._env_checker.check_environment()
@@ -126,7 +123,7 @@ class Start(Scaffold):
             )
             self._binding.on_disconnect(
                 lambda chat_id: asyncio.run_coroutine_threadsafe(
-                    self._need_unmute.discard(chat_id),
+                    clear_cache(chat_id),
                     loop,
                 ),
             )

pytgcalls/mtproto_required.py

@@ -1,4 +1,3 @@
-import inspect
 from functools import wraps
 
 from .exceptions import ClientNotStarted
@@ -6,7 +5,7 @@ from .exceptions import NoMTProtoClientSet
 
 
 def mtproto_required(func):
-    def check_mtproto(*args, **_):
+    def check_mtproto(*args):
         self = args[0]
         if not self._app:
             raise NoMTProtoClientSet()
@@ -16,16 +15,7 @@ def mtproto_required(func):
 
     @wraps(func)
     async def async_wrapper(*args, **kwargs):
-        check_mtproto(*args, **kwargs)
+        check_mtproto(*args)
         return await func(*args, **kwargs)
 
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        check_mtproto(*args, **kwargs)
-        return func(*args, **kwargs)
-
-    if inspect.iscoroutinefunction(func) or \
-            inspect.isasyncgenfunction(func):
-        return async_wrapper
-    else:
-        return wrapper
+    return async_wrapper

pytgcalls/mutex.py

@@ -0,0 +1,38 @@
+import asyncio
+import logging
+from functools import wraps
+from inspect import signature
+from typing import Optional
+
+
+def mutex(func):
+    sig = signature(func)
+
+    @wraps(func)
+    async def async_wrapper(*args, **kwargs):
+        self = args[0]
+        bound = sig.bind(*args, **kwargs)
+
+        if 'chat_id' in bound.arguments:
+            chat_id: Optional[int] = None
+            try:
+                chat_id = await self._resolve_chat_id(
+                    bound.arguments['chat_id'],
+                )
+            except Exception as e:
+                logging.debug(
+                    'Error occurred while resolving chat_id. Reason: ' +
+                    str(e),
+                )
+            if chat_id is not None:
+                name = f'{func.__name__}_{chat_id}'
+                if name not in self._lock:
+                    self._lock[name] = asyncio.Lock()
+                async with self._lock[name]:
+                    try:
+                        return await func(*args, **kwargs)
+                    finally:
+                        self._lock.pop(name, None)
+
+        return await func(*args, **kwargs)
+    return async_wrapper

pytgcalls/scaffold.py

@@ -17,6 +17,7 @@ class Scaffold:
         # noinspection PyTypeChecker
         self._binding = None
         self._need_unmute = set()
+        self._lock = dict()
 
     def _handle_mtproto(self):
         pass

pytgcalls/ytdlp.py

@@ -36,6 +36,7 @@ class YtDlp:
             '-f',
             f'best[width<=?{video_parameters.width}]'
             f'[height<=?{video_parameters.height}]',
+            '--no-warnings',
         ]
 
         if add_commands: