pytonapi 2.2.0__tar.gz → 2.2.1__tar.gz

{pytonapi-2.2.0/pytonapi.egg-info → pytonapi-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytonapi
-Version: 2.2.0
+Version: 2.2.1
 Summary: Python SDK for TONAPI — REST API, streaming, and webhooks for TON blockchain.
 Author: nessshon
 Maintainer: nessshon
@@ -51,6 +51,7 @@ Dynamic: license-file
 ![Downloads](https://pepy.tech/badge/pytonapi)
 ![Downloads](https://pepy.tech/badge/pytonapi/month)
 ![Downloads](https://pepy.tech/badge/pytonapi/week)
+[![Context7](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fcontext7.com%2Fapi%2Fv2%2Flibs%2Fsearch%3FlibraryName%3Dnessshon%2Ftonapi%26query%3Dtonapi&query=%24.results%5B0%5D.benchmarkScore&label=Context7&suffix=%2F100&color=blue)](https://context7.com/nessshon/tonapi)
 
 ### Python SDK for [TON API](https://tonapi.io)
 

{pytonapi-2.2.0 → pytonapi-2.2.1}/README.md

@@ -11,6 +11,7 @@
 ![Downloads](https://pepy.tech/badge/pytonapi)
 ![Downloads](https://pepy.tech/badge/pytonapi/month)
 ![Downloads](https://pepy.tech/badge/pytonapi/week)
+[![Context7](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fcontext7.com%2Fapi%2Fv2%2Flibs%2Fsearch%3FlibraryName%3Dnessshon%2Ftonapi%26query%3Dtonapi&query=%24.results%5B0%5D.benchmarkScore&label=Context7&suffix=%2F100&color=blue)](https://context7.com/nessshon/tonapi)
 
 ### Python SDK for [TON API](https://tonapi.io)
 

{pytonapi-2.2.0 → pytonapi-2.2.1}/pytonapi/__meta__.py

@@ -3,6 +3,6 @@
 # This source code is licensed under the MIT License found in the
 # LICENSE file in the root directory of this source tree.
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __author__ = "nessshon"
 __url__ = "https://github.com/nessshon/tonapi"

{pytonapi-2.2.0 → pytonapi-2.2.1}/pytonapi/client.py

@@ -107,6 +107,18 @@ class BaseClient:
             await asyncio.sleep(0)
             self._session = None
 
+    @property
+    def session(self) -> aiohttp.ClientSession:
+        """Active ``aiohttp.ClientSession``.
+
+        :raises TONAPISessionNotCreatedError: If the session has not been
+            created yet — call ``create_session()`` or use the client as an
+            async context manager first.
+        """
+        if self._session is None or self._session.closed:
+            raise TONAPISessionNotCreatedError(self.__class__.__name__)
+        return self._session
+
     async def __aenter__(self: _Self) -> _Self:
         """Enter the async context manager."""
         await self.create_session()

{pytonapi-2.2.0 → pytonapi-2.2.1}/pytonapi/webhook/dispatcher.py

@@ -106,20 +106,21 @@ class TonapiWebhookDispatcher:
         for event_type, handlers in self._handlers.items():
             if not handlers:
                 continue
-            suffix = self.DEFAULT_SUFFIXES[event_type]
-            local_path = self._path + suffix
-            webhook = await self._client.ensure(f"{self._url}{suffix}")
-            self._tokens[local_path] = webhook.token
-
-            if event_type is WebhookEventType.ACCOUNT_TX and self._accounts:
-                await webhook.sync_accounts(list(self._accounts))
-            elif event_type is WebhookEventType.MEMPOOL_MSG:
-                await webhook.subscribe_mempool_msg()
-            elif event_type is WebhookEventType.OPCODE_MSG and self._opcodes:
-                for opcode in self._opcodes:
-                    await webhook.subscribe_opcode_msg(opcode)
-            elif event_type is WebhookEventType.NEW_CONTRACTS:
-                await webhook.subscribe_new_contracts()
+            # One webhook per distinct path (incl. custom ``path=``) so every
+            # path gets its token stored — otherwise auth is silently skipped.
+            for local_path in sorted({path for _, _, path in handlers}):
+                webhook = await self._client.ensure(self._endpoint_for_path(local_path))
+                self._tokens[local_path] = webhook.token
+
+                if event_type is WebhookEventType.ACCOUNT_TX and self._accounts:
+                    await webhook.sync_accounts(list(self._accounts))
+                elif event_type is WebhookEventType.MEMPOOL_MSG:
+                    await webhook.subscribe_mempool_msg()
+                elif event_type is WebhookEventType.OPCODE_MSG and self._opcodes:
+                    for opcode in self._opcodes:
+                        await webhook.subscribe_opcode_msg(opcode)
+                elif event_type is WebhookEventType.NEW_CONTRACTS:
+                    await webhook.subscribe_new_contracts()
 
     async def teardown(self, cleanup: bool = False) -> None:
         """Close session and optionally unsubscribe.
@@ -140,22 +141,22 @@ class TonapiWebhookDispatcher:
             for event_type, handlers in self._handlers.items():
                 if not handlers:
                     continue
-                suffix = self.DEFAULT_SUFFIXES[event_type]
-                endpoint = f"{self._url}{suffix}"
-                info = endpoint_map.get(endpoint)
-                if info is None:
-                    continue
-                webhook = TonapiWebhook(self._client, info.id, info.endpoint, info.token)
-
-                if event_type is WebhookEventType.ACCOUNT_TX and self._accounts:
-                    await webhook.unsubscribe(list(self._accounts))
-                elif event_type is WebhookEventType.MEMPOOL_MSG:
-                    await webhook.unsubscribe_mempool_msg()
-                elif event_type is WebhookEventType.OPCODE_MSG and self._opcodes:
-                    for opcode in self._opcodes:
-                        await webhook.unsubscribe_opcode_msg(opcode)
-                elif event_type is WebhookEventType.NEW_CONTRACTS:
-                    await webhook.unsubscribe_new_contracts()
+                for local_path in sorted({path for _, _, path in handlers}):
+                    endpoint = self._endpoint_for_path(local_path)
+                    info = endpoint_map.get(endpoint)
+                    if info is None:
+                        continue
+                    webhook = TonapiWebhook(self._client, info.id, info.endpoint, info.token)
+
+                    if event_type is WebhookEventType.ACCOUNT_TX and self._accounts:
+                        await webhook.unsubscribe(list(self._accounts))
+                    elif event_type is WebhookEventType.MEMPOOL_MSG:
+                        await webhook.unsubscribe_mempool_msg()
+                    elif event_type is WebhookEventType.OPCODE_MSG and self._opcodes:
+                        for opcode in self._opcodes:
+                            await webhook.unsubscribe_opcode_msg(opcode)
+                    elif event_type is WebhookEventType.NEW_CONTRACTS:
+                        await webhook.unsubscribe_new_contracts()
 
         await self._client.close_session()
 
@@ -177,9 +178,18 @@ class TonapiWebhookDispatcher:
         """
         return self._path + self.DEFAULT_SUFFIXES[event_type]
 
+    def _endpoint_for_path(self, path: str) -> str:
+        """Build the absolute webhook endpoint URL for a local path.
+
+        :param path: Local URL path component.
+        :return: Absolute endpoint URL.
+        """
+        parsed = urlparse(self._url)
+        return parsed._replace(path=path, params="", query="", fragment="").geturl()
+
     def _build_path_map(self) -> dict[str, WebhookEventType]:
-        """Build reverse mapping from path to event type."""
-        return {handlers[0][2]: et for et, handlers in self._handlers.items() if handlers}
+        """Build reverse mapping from every registered path to its event type."""
+        return {path: et for et, handlers in self._handlers.items() for _, _, path in handlers}
 
     def account_tx(
         self,

{pytonapi-2.2.0 → pytonapi-2.2.1/pytonapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytonapi
-Version: 2.2.0
+Version: 2.2.1
 Summary: Python SDK for TONAPI — REST API, streaming, and webhooks for TON blockchain.
 Author: nessshon
 Maintainer: nessshon
@@ -51,6 +51,7 @@ Dynamic: license-file
 ![Downloads](https://pepy.tech/badge/pytonapi)
 ![Downloads](https://pepy.tech/badge/pytonapi/month)
 ![Downloads](https://pepy.tech/badge/pytonapi/week)
+[![Context7](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fcontext7.com%2Fapi%2Fv2%2Flibs%2Fsearch%3FlibraryName%3Dnessshon%2Ftonapi%26query%3Dtonapi&query=%24.results%5B0%5D.benchmarkScore&label=Context7&suffix=%2F100&color=blue)](https://context7.com/nessshon/tonapi)
 
 ### Python SDK for [TON API](https://tonapi.io)
 

{pytonapi-2.2.0 → pytonapi-2.2.1}/pytonapi.egg-info/SOURCES.txt

@@ -71,4 +71,5 @@ pytonapi/webhook/__init__.py
 pytonapi/webhook/client.py
 pytonapi/webhook/dispatcher.py
 pytonapi/webhook/models.py
+tests/test_client.py
 tests/test_utils.py

pytonapi-2.2.1/tests/test_client.py

@@ -0,0 +1,32 @@
+from unittest import IsolatedAsyncioTestCase
+
+import aiohttp
+
+from pytonapi.exceptions import TONAPISessionNotCreatedError
+from pytonapi.rest import TonapiRestClient
+
+
+class TestSessionProperty(IsolatedAsyncioTestCase):
+    async def test_raises_before_create_session(self) -> None:
+        client = TonapiRestClient()
+        with self.assertRaises(TONAPISessionNotCreatedError):
+            _ = client.session
+
+    async def test_returns_active_session(self) -> None:
+        client = TonapiRestClient()
+        await client.create_session()
+        try:
+            self.assertIsInstance(client.session, aiohttp.ClientSession)
+        finally:
+            await client.close_session()
+
+    async def test_raises_after_close(self) -> None:
+        client = TonapiRestClient()
+        await client.create_session()
+        await client.close_session()
+        with self.assertRaises(TONAPISessionNotCreatedError):
+            _ = client.session
+
+    async def test_available_in_context_manager(self) -> None:
+        async with TonapiRestClient() as client:
+            self.assertIsInstance(client.session, aiohttp.ClientSession)