pytonapi 2.0.1__tar.gz → 2.1.0__tar.gz

{pytonapi-2.0.1/pytonapi.egg-info → pytonapi-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytonapi
-Version: 2.0.1
+Version: 2.1.0
 Summary: Python SDK for TONAPI — REST API, streaming, and webhooks for TON blockchain.
 Author: nessshon
 Maintainer: nessshon
@@ -24,10 +24,10 @@ Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: pydantic<3.0,>=2.4.1
+Requires-Dist: pydantic<3.0,>=2.0
 Dynamic: license-file
 
-# 📦 PyTONAPI
+# 📦 TON API
 
 [![TON](https://img.shields.io/badge/TON-grey?logo=TON&logoColor=40AEF0)](https://ton.org)
 ![Python Versions](https://img.shields.io/badge/Python-3.10%20--%203.14-black?color=FFE873&labelColor=3776AB)
@@ -35,17 +35,16 @@ Dynamic: license-file
 [![License](https://img.shields.io/github/license/nessshon/tonapi)](https://github.com/nessshon/tonapi/blob/main/LICENSE)
 [![Donate](https://img.shields.io/badge/Donate-TON-blue)](https://tonviewer.com/UQCZq3_Vd21-4y4m7Wc-ej9NFOhh_qvdfAkAYAOHoQ__Ness)
 
-![Image](https://raw.githubusercontent.com/nessshon/tonapi/main/assets/banner.png)
+![Image](https://raw.githubusercontent.com/nessshon/tonapi/main/banner.png)
 
 ![Downloads](https://pepy.tech/badge/pytonapi)
 ![Downloads](https://pepy.tech/badge/pytonapi/month)
 ![Downloads](https://pepy.tech/badge/pytonapi/week)
 
-### Python SDK for [TONAPI](https://tonapi.io)
+### Python SDK for [TON API](https://tonapi.io)
 
-Access TON blockchain data via REST API, real-time streaming, and webhooks.
-API key required — obtain at [tonconsole.com](https://tonconsole.com/), docs
-at [docs.tonconsole.com](https://docs.tonconsole.com/).
+Access TON blockchain data via REST API, real-time streaming, and webhooks.  
+API key optional for REST, required for streaming and webhooks — obtain at [tonconsole.com](https://tonconsole.com/).
 
 > For creating wallets, transferring TON, jettons, etc., use [tonutils](https://github.com/nessshon/tonutils).
 
@@ -64,6 +63,17 @@ at [docs.tonconsole.com](https://docs.tonconsole.com/).
 pip install pytonapi
 ```
 
+[Claude Code plugin](https://github.com/nessshon/tonapi/blob/main/skills/tonapi/README.md):
+```
+/plugin marketplace add nessshon/claude-plugins
+/plugin install tonapi@nessshon-plugins
+```
+
+## Documentation
+
+[Documentation](https://tonapi.ness.su/) — API reference, streaming, and webhooks guides.  
+[llms.txt](https://tonapi.ness.su/llms.txt) — auto-generated machine-readable docs for AI tools.
+
 ## Examples
 
 **REST API**

{pytonapi-2.0.1 → pytonapi-2.1.0}/README.md

@@ -1,4 +1,4 @@
-# 📦 PyTONAPI
+# 📦 TON API
 
 [![TON](https://img.shields.io/badge/TON-grey?logo=TON&logoColor=40AEF0)](https://ton.org)
 ![Python Versions](https://img.shields.io/badge/Python-3.10%20--%203.14-black?color=FFE873&labelColor=3776AB)
@@ -6,17 +6,16 @@
 [![License](https://img.shields.io/github/license/nessshon/tonapi)](https://github.com/nessshon/tonapi/blob/main/LICENSE)
 [![Donate](https://img.shields.io/badge/Donate-TON-blue)](https://tonviewer.com/UQCZq3_Vd21-4y4m7Wc-ej9NFOhh_qvdfAkAYAOHoQ__Ness)
 
-![Image](https://raw.githubusercontent.com/nessshon/tonapi/main/assets/banner.png)
+![Image](https://raw.githubusercontent.com/nessshon/tonapi/main/banner.png)
 
 ![Downloads](https://pepy.tech/badge/pytonapi)
 ![Downloads](https://pepy.tech/badge/pytonapi/month)
 ![Downloads](https://pepy.tech/badge/pytonapi/week)
 
-### Python SDK for [TONAPI](https://tonapi.io)
+### Python SDK for [TON API](https://tonapi.io)
 
-Access TON blockchain data via REST API, real-time streaming, and webhooks.
-API key required — obtain at [tonconsole.com](https://tonconsole.com/), docs
-at [docs.tonconsole.com](https://docs.tonconsole.com/).
+Access TON blockchain data via REST API, real-time streaming, and webhooks.  
+API key optional for REST, required for streaming and webhooks — obtain at [tonconsole.com](https://tonconsole.com/).
 
 > For creating wallets, transferring TON, jettons, etc., use [tonutils](https://github.com/nessshon/tonutils).
 
@@ -35,6 +34,17 @@ at [docs.tonconsole.com](https://docs.tonconsole.com/).
 pip install pytonapi
 ```
 
+[Claude Code plugin](https://github.com/nessshon/tonapi/blob/main/skills/tonapi/README.md):
+```
+/plugin marketplace add nessshon/claude-plugins
+/plugin install tonapi@nessshon-plugins
+```
+
+## Documentation
+
+[Documentation](https://tonapi.ness.su/) — API reference, streaming, and webhooks guides.  
+[llms.txt](https://tonapi.ness.su/llms.txt) — auto-generated machine-readable docs for AI tools.
+
 ## Examples
 
 **REST API**

{pytonapi-2.0.1 → pytonapi-2.1.0}/pyproject.toml

@@ -14,7 +14,7 @@ maintainers = [
 ]
 dependencies = [
     "aiohttp>=3.9.0",
-    "pydantic>=2.4.1,<3.0",
+    "pydantic>=2.0,<3.0",
 ]
 keywords = [
     "AsyncIO",
@@ -104,8 +104,6 @@ select = [
     "RUF",
 ]
 ignore = [
-    # line too long
-    "E501",
     # docstring in public module
     "D100",
     # docstring in public package
@@ -116,6 +114,8 @@ ignore = [
     "D107",
     # blank line before class docstring (conflicts D211)
     "D203",
+    # 1 blank line required between summary and description (multi-line summary)
+    "D205",
     # multi-line summary second line (conflicts D212)
     "D213",
     # first word capitalization (false positive for proper nouns like dApp)
@@ -129,6 +129,7 @@ ignore = [
 "__init__.py" = ["F401"]
 "pytonapi/rest/models/*" = ["D101"]
 "tests/*" = ["D101", "D102", "T20"]
+"tests/rest/fixtures.py" = ["E501"]
 "codegen/*" = ["T20"]
 "examples/*" = ["D", "T20", "RUF006", "RUF059"]
 
@@ -152,4 +153,9 @@ enable_error_code = [
     "ignore-without-code",
     "redundant-cast",
     "truthy-bool",
-]
+]
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+disallow_untyped_defs = false
+disallow_incomplete_defs = false

{pytonapi-2.0.1 → pytonapi-2.1.0}/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.0.1"
+__version__ = "2.1.0"
 __author__ = "nessshon"
 __url__ = "https://github.com/nessshon/tonapi"

{pytonapi-2.0.1 → pytonapi-2.1.0}/pytonapi/client.py

@@ -4,13 +4,18 @@ import asyncio
 import json
 import typing as t
 
+if t.TYPE_CHECKING:
+    import types
+
 import aiohttp
+from pydantic import TypeAdapter, ValidationError
 
 from pytonapi.exceptions import (
     TONAPIConnectionError,
     TONAPIError,
     TONAPIRetryLimitError,
     TONAPISessionNotCreatedError,
+    TONAPIValidationError,
     raise_for_status,
 )
 from pytonapi.types import (
@@ -21,6 +26,18 @@ from pytonapi.types import (
 __all__ = ["BaseClient"]
 
 T = t.TypeVar("T")
+_Self = t.TypeVar("_Self", bound="BaseClient")
+
+_adapter_cache: dict[t.Any, TypeAdapter[t.Any]] = {}
+
+
+def _get_adapter(model: t.Any) -> TypeAdapter[t.Any]:
+    """Return a cached ``TypeAdapter`` for the given model."""
+    adapter = _adapter_cache.get(model)
+    if adapter is None:
+        adapter = TypeAdapter(model)
+        _adapter_cache[model] = adapter
+    return adapter
 
 
 class BaseClient:
@@ -28,8 +45,8 @@ class BaseClient:
 
     def __init__(
         self,
-        api_key: str,
-        base_url: str,
+        api_key: str = "",
+        base_url: str = "",
         *,
         timeout: float = 10.0,
         session: aiohttp.ClientSession | None = None,
@@ -39,7 +56,9 @@ class BaseClient:
     ) -> None:
         """Initialize the base HTTP client.
 
-        :param api_key: TONAPI key. Get one at https://tonconsole.com/.
+        :param api_key: TONAPI key. Optional for REST — without a key
+            requests are throttled to ~0.24 RPS (1 per 4 seconds).
+            Get one at https://tonconsole.com/.
         :param base_url: Base URL for all requests.
         :param timeout: Request timeout in seconds.
         :param session: Optional external ``aiohttp.ClientSession``.
@@ -60,7 +79,7 @@ class BaseClient:
         self._is_external_session = session is not None
         self._retry_policy = retry_policy
 
-    async def create_session(self) -> BaseClient:
+    async def create_session(self: _Self) -> _Self:
         """Create an ``aiohttp.ClientSession`` for making requests.
 
         If an external session was provided via the ``session`` parameter,
@@ -85,9 +104,10 @@ class BaseClient:
         """
         if self._session and not self._session.closed and not self._is_external_session:
             await self._session.close()
+            await asyncio.sleep(0)
             self._session = None
 
-    async def __aenter__(self) -> BaseClient:
+    async def __aenter__(self: _Self) -> _Self:
         """Enter the async context manager."""
         await self.create_session()
         return self
@@ -96,7 +116,7 @@ class BaseClient:
         self,
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
-        exc_tb: t.Any | None,
+        exc_tb: types.TracebackType | None,
     ) -> None:
         """Exit the async context manager."""
         await self.close_session()
@@ -106,10 +126,9 @@ class BaseClient:
 
         :return: Merged headers dict.
         """
-        base = {
-            "Authorization": f"Bearer {self._api_key}",
-            "Accept": "application/json",
-        }
+        base: dict[str, str] = {"Accept": "application/json"}
+        if self._api_key:
+            base["Authorization"] = f"Bearer {self._api_key}"
         base.update(self._headers)
         return base
 
@@ -179,11 +198,7 @@ class BaseClient:
         """
         url = f"{self._base_url}{path}"
         if params:
-            params = {
-                k: str(v).lower() if isinstance(v, bool) else v
-                for k, v in params.items()
-                if v is not None
-            }
+            params = {k: str(v).lower() if isinstance(v, bool) else v for k, v in params.items() if v is not None}
         if headers:
             headers = {k: str(v) for k, v in headers.items() if v is not None}
 
@@ -283,4 +298,10 @@ class BaseClient:
         data, _ = self._parse_body(text)
         if data is None:
             raise TONAPIError(f"Expected JSON response, got: {text}")
-        return response_model.model_validate(data)  # type: ignore[attr-defined]
+        try:
+            return _get_adapter(response_model).validate_python(data)
+        except ValidationError as exc:
+            raise TONAPIValidationError(
+                model=response_model,
+                errors=exc.errors(),
+            ) from exc

{pytonapi-2.0.1 → pytonapi-2.1.0}/pytonapi/exceptions.py

@@ -5,11 +5,14 @@ __all__ = [
     "TONAPI_STATUS_TO_EXCEPTION",
     "TONAPIBadRequestError",
     "TONAPIClientError",
+    "TONAPIConflictError",
     "TONAPIConnectionError",
     "TONAPIConnectionLostError",
     "TONAPIError",
     "TONAPIForbiddenError",
+    "TONAPIGatewayTimeoutError",
     "TONAPIInternalServerError",
+    "TONAPIMethodNotAllowedError",
     "TONAPINotFoundError",
     "TONAPINotImplementedError",
     "TONAPIRetryLimitError",
@@ -19,6 +22,8 @@ __all__ = [
     "TONAPIStreamingError",
     "TONAPITooManyRequestsError",
     "TONAPIUnauthorizedError",
+    "TONAPIUnprocessableError",
+    "TONAPIValidationError",
     "raise_for_status",
 ]
 
@@ -81,6 +86,18 @@ class TONAPINotFoundError(TONAPIClientError):
     """HTTP 404 Not Found."""
 
 
+class TONAPIMethodNotAllowedError(TONAPIClientError):
+    """HTTP 405 Method Not Allowed."""
+
+
+class TONAPIConflictError(TONAPIClientError):
+    """HTTP 409 Conflict."""
+
+
+class TONAPIUnprocessableError(TONAPIClientError):
+    """HTTP 422 Unprocessable Entity."""
+
+
 class TONAPITooManyRequestsError(TONAPIClientError):
     """HTTP 429 Too Many Requests."""
 
@@ -95,6 +112,27 @@ class TONAPINotImplementedError(TONAPIServerError):
     """HTTP 501 Not Implemented."""
 
 
+class TONAPIGatewayTimeoutError(TONAPIServerError):
+    """HTTP 504 Gateway Timeout."""
+
+
+class TONAPIValidationError(TONAPIError):
+    """Response body did not match the expected Pydantic model."""
+
+    model: type
+    errors: list[t.Any]
+
+    def __init__(self, *, model: type, errors: list[t.Any]) -> None:
+        self.model = model
+        self.errors = errors
+        field_hints = ", ".join(f"{e.get('loc', '?')}: {e.get('msg', '')}" for e in errors[:3])
+        if len(errors) > 3:
+            field_hints += f" ... (+{len(errors) - 3} more)"
+        super().__init__(
+            f"Response validation failed for {model.__name__}: {field_hints}",
+        )
+
+
 class TONAPIStreamingError(TONAPIError):
     """Streaming transport error."""
 
@@ -158,9 +196,13 @@ TONAPI_STATUS_TO_EXCEPTION: t.Final[dict[int, type[TONAPIStatusError]]] = {
     401: TONAPIUnauthorizedError,
     403: TONAPIForbiddenError,
     404: TONAPINotFoundError,
+    405: TONAPIMethodNotAllowedError,
+    409: TONAPIConflictError,
+    422: TONAPIUnprocessableError,
     429: TONAPITooManyRequestsError,
     500: TONAPIInternalServerError,
     501: TONAPINotImplementedError,
+    504: TONAPIGatewayTimeoutError,
 }
 
 

pytonapi-2.1.0/pytonapi/rest/client.py

@@ -0,0 +1,156 @@
+from __future__ import annotations
+
+import typing as t
+
+import aiohttp
+
+from pytonapi.client import BaseClient
+from pytonapi.exceptions import TONAPITooManyRequestsError
+from pytonapi.rest.limiter import RateLimiter
+from pytonapi.rest.mixin import ResourcesMixin
+from pytonapi.rest.rotator import KeyRotator
+from pytonapi.types import (
+    DEFAULT_RETRY_POLICY,
+    NETWORK_BASE_URLS,
+    ApiKey,
+    Network,
+    RetryPolicy,
+)
+
+__all__ = ["TonapiRestClient"]
+
+T = t.TypeVar("T")
+
+
+class TonapiRestClient(BaseClient, ResourcesMixin):
+    """Async client for the TONAPI."""
+
+    def __init__(
+        self,
+        api_key: str | ApiKey | list[ApiKey] = "",
+        network: Network = Network.MAINNET,
+        *,
+        base_url: str | None = None,
+        timeout: float = 10.0,
+        session: aiohttp.ClientSession | None = None,
+        headers: dict[str, str] | None = None,
+        cookies: dict[str, str] | None = None,
+        rps_limit: int | None = None,
+        rps_period: float | None = None,
+        retry_policy: RetryPolicy | None = DEFAULT_RETRY_POLICY,
+    ) -> None:
+        """Initialize the TONAPI client.
+
+        :param api_key: TONAPI key, ``ApiKey`` with per-key rate limit,
+            or a list of ``ApiKey`` for automatic rotation on HTTP 429.
+            Optional — without a key requests are throttled to ~0.24 RPS
+            (1 per 4 seconds). Get one at https://tonconsole.com/.
+        :param network: Target network (``Network.MAINNET`` or ``Network.TESTNET``).
+        :param base_url: Custom base URL (overrides ``network``).
+        :param timeout: Request timeout in seconds.
+        :param session: Optional external ``aiohttp.ClientSession``.
+            When provided, the client will not close it — the caller
+            is responsible for managing its lifecycle.
+        :param headers: Additional HTTP headers sent with every request.
+        :param cookies: Additional cookies sent with every request.
+        :param rps_limit: Maximum requests per second.
+            Used only when ``api_key`` is a plain string.
+            ``None`` (default) — auto: ``1`` RPS without a key,
+            disabled with a key. ``0`` — explicitly disabled.
+        :param rps_period: Rate-limiter window in seconds.
+            Used only when ``api_key`` is a plain string.
+            ``None`` (default) — ``4.0`` s when auto-limiting
+            without a key, ``1.0`` s when ``rps_limit`` is set
+            explicitly.
+        :param retry_policy: Retry policy, or ``None`` to disable retries.
+        """
+        if isinstance(api_key, list):
+            self._key_rotator: KeyRotator | None = KeyRotator(api_key) if api_key else None
+            initial_key = api_key[0].key if api_key else ""
+            self._rate_limiter: RateLimiter | None = None
+        elif isinstance(api_key, ApiKey):
+            self._key_rotator = None
+            initial_key = api_key.key
+            self._rate_limiter = (
+                RateLimiter(rps=api_key.rps_limit, period=api_key.rps_period) if api_key.rps_limit > 0 else None
+            )
+        else:
+            self._key_rotator = None
+            initial_key = api_key
+            if rps_limit is None:
+                self._rate_limiter = RateLimiter(rps=1, period=rps_period or 4.0) if not api_key else None
+            elif rps_limit > 0:
+                self._rate_limiter = RateLimiter(rps=rps_limit, period=rps_period or 1.0)
+            else:
+                self._rate_limiter = None
+
+        super().__init__(
+            api_key=initial_key,
+            base_url=base_url or NETWORK_BASE_URLS[network],
+            timeout=timeout,
+            session=session,
+            headers=headers,
+            cookies=cookies,
+            retry_policy=retry_policy,
+        )
+        ResourcesMixin.__init__(self, self)
+
+    async def request(
+        self,
+        method: str,
+        path: str,
+        *,
+        params: dict[str, t.Any] | None = None,
+        body: t.Any | None = None,
+        headers: dict[str, t.Any] | None = None,
+        response_model: type[T] | None = None,
+    ) -> t.Any:
+        """Execute an HTTP request with retry and rate limiting.
+
+        When multiple ``ApiKey`` instances are configured, rotates to the
+        next key after all retries for the current key are exhausted on
+        HTTP 429.  Each key uses its own ``RateLimiter``.
+
+        :param method: HTTP method (``GET``, ``POST``, etc.).
+        :param path: API path.
+        :param params: Query parameters.
+        :param body: JSON request body.
+        :param headers: Additional request headers.
+        :param response_model: Pydantic model to parse response into.
+        :return: Parsed model instance, raw dict, or ``None``.
+        """
+        if self._key_rotator is None:
+            if self._rate_limiter:
+                await self._rate_limiter.acquire()
+            return await super().request(
+                method,
+                path,
+                params=params,
+                body=body,
+                headers=headers,
+                response_model=response_model,
+            )
+
+        last_exc: TONAPITooManyRequestsError | None = None
+        for _ in range(len(self._key_rotator)):
+            limiter = self._key_rotator.current_limiter
+            if limiter:
+                await limiter.acquire()
+            key_headers = {
+                **(headers or {}),
+                "Authorization": f"Bearer {self._key_rotator.current_key}",
+            }
+            try:
+                return await super().request(
+                    method,
+                    path,
+                    params=params,
+                    body=body,
+                    headers=key_headers,
+                    response_model=response_model,
+                )
+            except TONAPITooManyRequestsError as exc:
+                last_exc = exc
+                self._key_rotator.rotate()
+
+        raise last_exc  # type: ignore[misc]

pytonapi-2.1.0/pytonapi/rest/mixin.py

@@ -0,0 +1,54 @@
+# This file is auto-generated. Do not edit manually.
+
+from __future__ import annotations
+
+import typing as t
+
+from pytonapi.rest.resources.accounts import AccountsResource
+from pytonapi.rest.resources.blockchain import BlockchainResource
+from pytonapi.rest.resources.connect import ConnectResource
+from pytonapi.rest.resources.dns import DNSResource
+from pytonapi.rest.resources.emulation import EmulationResource
+from pytonapi.rest.resources.events import EventsResource
+from pytonapi.rest.resources.extra_currency import ExtraCurrencyResource
+from pytonapi.rest.resources.gasless import GaslessResource
+from pytonapi.rest.resources.jettons import JettonsResource
+from pytonapi.rest.resources.lite_server import LiteServerResource
+from pytonapi.rest.resources.multisig import MultisigResource
+from pytonapi.rest.resources.nft import NFTResource
+from pytonapi.rest.resources.purchases import PurchasesResource
+from pytonapi.rest.resources.rates import RatesResource
+from pytonapi.rest.resources.staking import StakingResource
+from pytonapi.rest.resources.storage import StorageResource
+from pytonapi.rest.resources.traces import TracesResource
+from pytonapi.rest.resources.utilities import UtilitiesResource
+from pytonapi.rest.resources.wallet import WalletResource
+
+if t.TYPE_CHECKING:
+    from pytonapi.rest.client import TonapiRestClient
+
+
+class ResourcesMixin:
+    """Mixin that exposes all API resources as properties."""
+
+    def __init__(self, client: TonapiRestClient) -> None:
+        self._client = client
+        self.accounts = AccountsResource(client)
+        self.blockchain = BlockchainResource(client)
+        self.connect = ConnectResource(client)
+        self.dns = DNSResource(client)
+        self.emulation = EmulationResource(client)
+        self.events = EventsResource(client)
+        self.extra_currency = ExtraCurrencyResource(client)
+        self.gasless = GaslessResource(client)
+        self.jettons = JettonsResource(client)
+        self.lite_server = LiteServerResource(client)
+        self.multisig = MultisigResource(client)
+        self.nft = NFTResource(client)
+        self.purchases = PurchasesResource(client)
+        self.rates = RatesResource(client)
+        self.staking = StakingResource(client)
+        self.storage = StorageResource(client)
+        self.traces = TracesResource(client)
+        self.utilities = UtilitiesResource(client)
+        self.wallet = WalletResource(client)

{pytonapi-2.0.1 → pytonapi-2.1.0}/pytonapi/rest/models/__init__.py

@@ -33,6 +33,7 @@ from pytonapi.rest.models.accounts import (
     EncryptedComment,
     ExecGetMethodArg,
     ExtraCurrencies,
+    ExtraCurrency,
     ExtraCurrencyTransferAction,
     FlawedJettonTransferAction,
     FoundAccounts,
@@ -88,7 +89,6 @@ from pytonapi.rest.models.blockchain import (
     ConfigProposalSetup,
     CreditPhase,
     Error,
-    ExtraCurrency,
     GasLimitPrices,
     JettonBridgeParams,
     JettonBridgePrices,
@@ -126,7 +126,7 @@ from pytonapi.rest.models.dns import (
     PictureDNS,
     WalletDNS,
 )
-from pytonapi.rest.models.emulation import DecodedMessage, DecodedRawMessage
+from pytonapi.rest.models.emulation import DecodedMessage, DecodedRawMessage, JettonQuantity, MessageConsequences, Risk
 from pytonapi.rest.models.events import Event, ValueFlow
 from pytonapi.rest.models.extra_currency import EcPreview
 from pytonapi.rest.models.gasless import GaslessConfig, GaslessTx, SignRawMessage, SignRawParams
@@ -139,7 +139,7 @@ from pytonapi.rest.models.jettons import (
     ScaledUI,
 )
 from pytonapi.rest.models.lite_server import BlockRaw, InitStateRaw
-from pytonapi.rest.models.multisig import JettonQuantity, Multisig, MultisigOrder, Risk
+from pytonapi.rest.models.multisig import Multisig, MultisigOrder
 from pytonapi.rest.models.nft import (
     ImagePreview,
     NftApprovedBy,
@@ -158,7 +158,6 @@ from pytonapi.rest.models.storage import StorageProvider
 from pytonapi.rest.models.traces import Trace
 from pytonapi.rest.models.utilities import ServiceStatus
 from pytonapi.rest.models.wallet import (
-    MessageConsequences,
     Seqno,
     Wallet,
     WalletPlugin,
@@ -190,6 +189,7 @@ _models_to_rebuild = [
     EncryptedComment,
     ExecGetMethodArg,
     ExtraCurrencies,
+    ExtraCurrency,
     ExtraCurrencyTransferAction,
     FlawedJettonTransferAction,
     FoundAccounts,
@@ -243,7 +243,6 @@ _models_to_rebuild = [
     ConfigProposalSetup,
     CreditPhase,
     Error,
-    ExtraCurrency,
     GasLimitPrices,
     JettonBridgeParams,
     JettonBridgePrices,
@@ -280,6 +279,9 @@ _models_to_rebuild = [
     WalletDNS,
     DecodedMessage,
     DecodedRawMessage,
+    JettonQuantity,
+    MessageConsequences,
+    Risk,
     Event,
     ValueFlow,
     EcPreview,
@@ -295,10 +297,8 @@ _models_to_rebuild = [
     ScaledUI,
     BlockRaw,
     InitStateRaw,
-    JettonQuantity,
     Multisig,
     MultisigOrder,
-    Risk,
     ImagePreview,
     NftCollection,
     NftCollections,
@@ -319,7 +319,6 @@ _models_to_rebuild = [
     StorageProvider,
     Trace,
     ServiceStatus,
-    MessageConsequences,
     Seqno,
     Wallet,
     WalletPlugin,