py-near 1.1.14__py3-none-any.whl → 1.1.16__py3-none-any.whl

py_near/account.py

@@ -368,17 +368,22 @@ class Account(object):
         )
 
     async def view_function(
-        self, contract_id: str, method_name: str, args: dict
+        self,
+        contract_id: str,
+        method_name: str,
+        args: dict,
+        block_id: Optional[int] = None,
     ) -> ViewFunctionResult:
         """
         Call view function on smart contract. View function is read only function, it can't change state
         :param contract_id: smart contract account id
         :param method_name: method name to call
         :param args: json args to call method
+        :param block_id: execution view transaction in block with given id
         :return: result of view function call
         """
         result = await self._provider.view_call(
-            contract_id, method_name, json.dumps(args).encode("utf8")
+            contract_id, method_name, json.dumps(args).encode("utf8"), block_id=block_id
         )
         if "error" in result:
             raise ViewFunctionError(result["error"])

py_near/exceptions/provider.py

@@ -119,7 +119,7 @@ class InvalidTransactionError(TransactionError):
 
 
 class TxExecutionError(InvalidTransactionError):
-    def __init__(self, data, error_json=None, **kwargs):
+    def __init__(self, data={}, error_json=None, **kwargs):
         super().__init__(error_json=error_json)
         if isinstance(data, str):
             data = json.loads(data)

py_near/providers.py

@@ -6,7 +6,7 @@ from typing import Optional
 import aiohttp
 from aiohttp import ClientResponseError, ClientConnectorError, ServerDisconnectedError
 from loguru import logger
-
+import datetime
 from py_near import constants
 from py_near.constants import TIMEOUT_WAIT_RPC
 from py_near.exceptions.exceptions import RpcNotAvailableError
@@ -51,21 +51,67 @@ class JsonProvider(object):
             self._rpc_addresses = rpc_addr
         else:
             self._rpc_addresses = [rpc_addr]
+        self._available_rpcs = self._rpc_addresses.copy()
+        self._last_rpc_addr_check = 0
+
+    async def check_available_rpcs(self):
+        available_rpcs = []
+        for rpc_addr in self._rpc_addresses:
+            try:
+                async with aiohttp.ClientSession() as session:
+                    timestamp_start = datetime.datetime.utcnow().timestamp()
+                    r = await session.get(
+                        "%s/status" % rpc_addr, timeout=TIMEOUT_WAIT_RPC
+                    )
+                    if r.status == 200:
+                        data = json.loads(await r.text())
+                        if not data["sync_info"]["syncing"]:
+                            available_rpcs.append(
+                                (
+                                    rpc_addr,
+                                    datetime.datetime.utcnow().timestamp()
+                                    - timestamp_start,
+                                )
+                            )
+                            continue
+                    if rpc_addr in self._available_rpcs:
+                        if r.status == 200:
+                            logger.error(f"Remove async RPC : {rpc_addr}")
+                        else:
+                            logger.error(
+                                f"Remove rpc because of error {r.status}: {rpc_addr}"
+                            )
+            except Exception as e:
+                if rpc_addr in self._available_rpcs:
+                    logger.error(f"Remove rpc: {e}")
+        self._available_rpcs = [
+            r[0] for r in sorted(available_rpcs, key=lambda x: x[1])
+        ]
 
     async def call_rpc_request(self, method, params, timeout=TIMEOUT_WAIT_RPC):
+        if (
+            self._last_rpc_addr_check < datetime.datetime.now().timestamp() - 30
+            or not self._available_rpcs
+        ):
+            self._last_rpc_addr_check = datetime.datetime.now().timestamp()
+            if self._available_rpcs:
+                asyncio.create_task(self.check_available_rpcs())
+            else:
+                logger.warning("No RPC available, rechecking")
+                await self.check_available_rpcs()
+
+        if not self._available_rpcs:
+            raise RpcNotAvailableError("No RPC available")
+
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
 
         content = None
-        for rpc_addr in self._rpc_addresses:
+        for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
                     r = await session.post(rpc_addr, json=j, timeout=timeout)
                     r.raise_for_status()
                     content = json.loads(await r.text())
-                if self._rpc_addresses[0] != rpc_addr:
-                    logger.info(f"Rpc update: {rpc_addr}")
-                    self._rpc_addresses.remove(rpc_addr)
-                    self._rpc_addresses.insert(0, rpc_addr)
                 break
             except (
                 RPCTimeoutError,
@@ -154,7 +200,7 @@ class JsonProvider(object):
             raise
 
     async def get_status(self):
-        for rpc_addr in self._rpc_addresses:
+        for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
                     r = await session.get(
@@ -162,11 +208,7 @@ class JsonProvider(object):
                     )
                     if r.status == 200:
                         data = json.loads(await r.text())
-                        if not data["sync_info"][
-                            "syncing"
-                        ]:  # RPC is not in syncing process
-                            self._rpc_addresses.remove(rpc_addr)
-                            self._rpc_addresses.insert(0, rpc_addr)
+                        if not data["sync_info"]["syncing"]:
                             return data
             except (
                 ClientResponseError,
@@ -224,17 +266,25 @@ class JsonProvider(object):
             },
         )
 
-    async def view_call(self, account_id, method_name, args, finality="optimistic"):
-        return await self.json_rpc(
-            "query",
-            {
-                "request_type": "call_function",
-                "account_id": account_id,
-                "method_name": method_name,
-                "args_base64": base64.b64encode(args).decode("utf8"),
-                "finality": finality,
-            },
-        )
+    async def view_call(
+        self,
+        account_id,
+        method_name,
+        args,
+        finality="optimistic",
+        block_id: Optional[int] = None,
+    ):
+        body = {
+            "request_type": "call_function",
+            "account_id": account_id,
+            "method_name": method_name,
+            "args_base64": base64.b64encode(args).decode("utf8"),
+        }
+        if block_id:
+            body["block_id"] = block_id
+        else:
+            body["finality"] = finality
+        return await self.json_rpc("query", body)
 
     async def get_block(self, block_id):
         return await self.json_rpc("block", [block_id])

{py_near-1.1.14.dist-info → py_near-1.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.14
+Version: 1.1.16
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3.7.4,<4.0.0)
 Requires-Dist: ed25519 (>=1.5,<2.0)
 Requires-Dist: py-near-primitives (>=0.2.3,<0.3.0)

{py_near-1.1.14.dist-info → py_near-1.1.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=k-bgn-VV6UIvqTuJpz-hnfn4uFXaabJRNgX--y_25kY,16325
+py_near/account.py,sha256=tMlQCCgI7H40pr1geArrUbQpaT7bP6wROVnFnfdRmG8,16484
 py_near/constants.py,sha256=inaWIuwmF1EB5JSB0ynnZY5rKY_QsxhF9KuCOhPsM6k,164
 py_near/dapps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_near/dapps/core.py,sha256=LtN9aW2gw2mvEdhzQcQJIidtjv-XL1xjb0LK8DzqtqE,231
@@ -18,12 +18,12 @@ py_near/dapps/staking/exceptions.py,sha256=UjXLFsDQX0vDGS9CGO7HE9XpLD0vovFNUzCb1
 py_near/dapps/staking/models.py,sha256=zC5M_pc1oMqHq4GaYif1uwFbW6acD2BsiA9rbyiaUTs,124
 py_near/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_near/exceptions/exceptions.py,sha256=qG-aBYAsyCXcdzmZ84n9wVHCLkuWnd16XZTVprJfUVM,5462
-py_near/exceptions/provider.py,sha256=RddgWbmwlXxrPuM7KtOjjJgtMR32ds2d3KxlnpMMC-A,7715
+py_near/exceptions/provider.py,sha256=K-wexgjPJ8sw42JePwaP7R5dJEIn9DoFJRvVcURsx6s,7718
 py_near/models.py,sha256=_JMpwtI6kP6740jaUPN1JRQIIDGXmL7tXLlR-JvRPXc,9417
-py_near/providers.py,sha256=W1ttqR-dfl_Ists8FbUL7O5wARX92JgAqIPQ7uGz-7M,9915
+py_near/providers.py,sha256=a70uIFoQeMBL28Dih5tD3WXmrsIDfenQBL_vVW-S_Ic,11807
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.14.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.14.dist-info/METADATA,sha256=dYh9HIxdTvtkZis5EbI--meZhJVl0NAW6XLC3DbQ1pc,4662
-py_near-1.1.14.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-py_near-1.1.14.dist-info/RECORD,,
+py_near-1.1.16.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.16.dist-info/METADATA,sha256=LQnPUz_D_f3z-BkCJnbYTqHconYGsjI29EgLzy5mUoY,4713
+py_near-1.1.16.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py_near-1.1.16.dist-info/RECORD,,

{py_near-1.1.14.dist-info → py_near-1.1.16.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any