py-near 1.1.43__py3-none-any.whl → 1.1.47__py3-none-any.whl

py_near/providers.py

@@ -5,8 +5,7 @@ import json
 from collections import Counter
 from typing import Optional
 
-import aiohttp
-from aiohttp import ClientResponseError, ClientConnectorError, ServerDisconnectedError
+import httpx
 from loguru import logger
 
 from py_near.constants import TIMEOUT_WAIT_RPC
@@ -61,10 +60,10 @@ class JsonProvider(object):
         self._last_rpc_addr_check = 0
         self.allow_broadcast = allow_broadcast
         self._timeout = timeout
-        self.session = aiohttp.ClientSession()
+        self._client: httpx.AsyncClient = httpx.AsyncClient()
 
     async def shutdown(self):
-        await self.session.close()
+        pass
 
     async def check_available_rpcs(self):
         if (
@@ -81,7 +80,8 @@ class JsonProvider(object):
             await asyncio.sleep(3)
 
         if not self._available_rpcs:
-            raise RpcNotAvailableError("All RPCs are unavailable")
+            self._available_rpcs = self._rpc_addresses.copy()
+            logger.error("All RPCs are async, reset to default list")
 
     async def _check_available_rpcs(self):
         available_rpcs = []
@@ -93,32 +93,46 @@ class JsonProvider(object):
                     "params": {"finality": "final"},
                     "id": 1,
                 }
-                async with aiohttp.ClientSession() as session:
-                    async with session.post(rpc_addr, json=data) as r:
-                        if r.status == 200:
-                            data = json.loads(await r.text())["result"]
-                            if data["sync_info"]["syncing"]:
-                                last_block_ts = datetime.datetime.fromisoformat(
-                                    data["sync_info"]["latest_block_time"]
-                                )
-                                diff = (
-                                    datetime.datetime.utcnow().timestamp()
-                                    - last_block_ts.timestamp()
-                                )
-                                is_syncing = diff > 60
-                            else:
-                                is_syncing = False
-                            if is_syncing:
-                                logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
-                                continue
-                            available_rpcs.append(rpc_addr)
-                        else:
-                            logger.error(
-                                f"Remove rpc because of error {r.status}: {rpc_addr}"
-                            )
+                auth_key = "py-near"
+                rpc_addr_url = rpc_addr
+                if "@" in rpc_addr:
+                    auth_key = rpc_addr_url.split("//")[1].split("@")[0]
+                    rpc_addr_url = rpc_addr_url.replace(auth_key + "@", "")
+
+                r = await self._client.post(
+                    rpc_addr_url,
+                    json=data,
+                    headers={
+                        "Referer": "https://tgapp.herewallet.app",
+                        "Authorization": f"Bearer {auth_key}",
+                    },
+                )
+                if r.status_code == 200:
+                    data = json.loads(r.text)["result"]
+                    diff = 0
+                    if data["sync_info"]["syncing"]:
+                        last_block_ts = datetime.datetime.fromisoformat(
+                            data["sync_info"]["latest_block_time"]
+                        )
+                        diff = (
+                            datetime.datetime.utcnow().timestamp()
+                            - last_block_ts.timestamp()
+                        )
+                        is_syncing = diff > 60
+                    else:
+                        is_syncing = False
+                    if is_syncing:
+                        logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
+                        continue
+                    available_rpcs.append(rpc_addr)
+                else:
+                    logger.error(
+                        f"Remove rpc because of error {r.status_code}: {rpc_addr}"
+                    )
             except Exception as e:
                 if rpc_addr in self._available_rpcs:
                     logger.error(f"Remove rpc: {e}")
+                logger.error(f"Rpc check error: {e}")
         self._available_rpcs = available_rpcs
 
     @staticmethod
@@ -138,24 +152,26 @@ class JsonProvider(object):
             if "@" in rpc_call_addr:
                 auth_key = rpc_call_addr.split("//")[1].split("@")[0]
                 rpc_call_addr = rpc_call_addr.replace(auth_key + "@", "")
-            async with aiohttp.ClientSession() as session:
-                r = await session.post(
-                    rpc_call_addr,
-                    json=j,
-                    timeout=self._timeout,
-                    headers={
-                        "Referer": "https://tgapp.herewallet.app",
-                        "Authorization": f"Bearer {auth_key}",
-                    },  # NEAR RPC requires Referer header
-                )
-                if r.status == 200:
-                    return json.loads(await r.text())
-                return {
-                    "error": {
-                        "cause": {"name": "RPC_ERROR", "message": f"Status: {r.status}"},
-                        "data": await r.text(),
-                    }
+            r = await self._client.post(
+                rpc_call_addr,
+                json=j,
+                timeout=self._timeout,
+                headers={
+                    "Referer": "https://tgapp.herewallet.app",
+                    "Authorization": f"Bearer {auth_key}",
+                },
+            )
+            if r.status_code == 200:
+                return json.loads(r.text)
+            return {
+                "error": {
+                    "cause": {
+                        "name": "RPC_ERROR",
+                        "message": f"Status: {r.status_code}",
+                    },
+                    "data": r.text,
                 }
+            }
 
         if broadcast or threshold:
             pending = [
@@ -163,6 +179,9 @@ class JsonProvider(object):
             ]
 
             responses = []
+            correct_responses = []
+            result = None
+
             while pending and len(pending):
                 done, pending = await asyncio.wait(
                     pending, return_when=asyncio.FIRST_COMPLETED
@@ -175,17 +194,25 @@ class JsonProvider(object):
                         responses.append(result)
                     except Exception as e:
                         logger.warning(e)
-                if responses:
+                if responses and threshold:
                     array = [hash(json.dumps(x)) for x in responses]
                     most_frequent_element = self.most_frequent_by_hash(array)
                     correct_responses = [
-                        x for x in responses if hash(json.dumps(x)) == most_frequent_element
+                        x
+                        for x in responses
+                        if hash(json.dumps(x)) == most_frequent_element
                     ]
                     if len(correct_responses) >= threshold:
                         for task in pending:
                             task.cancel()
-                        return most_frequent_element
+                        return correct_responses[0]
+            if threshold and threshold > 0:
+                raise RpcEmptyResponse(
+                    f"Threshold not reached: {len(correct_responses)}/{threshold}"
+                )
+            return result
         else:
+            res = None
             for rpc_addr in self._available_rpcs:
                 try:
                     res = await f(rpc_addr)
@@ -194,7 +221,7 @@ class JsonProvider(object):
                 except Exception as e:
                     logger.error(f"Rpc error: {e}")
                     continue
-        raise RpcEmptyResponse("RPC returned empty response")
+            return res
 
     @staticmethod
     def get_error_from_response(content: dict):
@@ -299,7 +326,7 @@ class JsonProvider(object):
 
     async def get_status(self):
         await self.check_available_rpcs()
-        for rpc_addr in self._available_rpcs:
+        for rpc_addr in self._available_rpcs.copy():
             try:
                 data = {
                     "jsonrpc": "2.0",
@@ -307,16 +334,19 @@ class JsonProvider(object):
                     "params": {"finality": "final"},
                     "id": 1,
                 }
-                async with aiohttp.ClientSession() as session:
-                    async with session.post(rpc_addr, json=data) as r:
-                        if r.status == 200:
-                            return json.loads(await r.text())["result"]
-            except (
-                ClientResponseError,
-                ClientConnectorError,
-                ServerDisconnectedError,
-                ConnectionError,
-            ) as e:
+                headers = {
+                    "Referer": "https://tgapp.herewallet.app",
+                }
+                if "@" in rpc_addr:
+                    auth_key = rpc_addr.split("//")[1].split("@")[0]
+                    rpc_addr = rpc_addr.replace(auth_key + "@", "")
+                    headers = {
+                        "Authorization": f"Bearer {auth_key}"
+                    }
+                r = await self._client.post(rpc_addr, json=data, headers=headers)
+                if r.status_code == 200:
+                    return json.loads(r.text)["result"]
+            except ConnectionError as e:
                 logger.error(f"Rpc get status error: {e}")
             except Exception as e:
                 logger.error(e)

{py_near-1.1.43.dist-info → py_near-1.1.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.43
+Version: 1.1.47
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app
@@ -12,9 +12,9 @@ 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)
+Requires-Dist: ed25519 (==1.5)
+Requires-Dist: httpx (==0.27.0)
+Requires-Dist: py-near-primitives (==0.2.3)
 Description-Content-Type: text/markdown
 
 # py-near

{py_near-1.1.43.dist-info → py_near-1.1.47.dist-info}/RECORD

@@ -20,10 +20,10 @@ py_near/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 py_near/exceptions/exceptions.py,sha256=DEFipaAHm0y7oCuN2QKzHsiQvUTUQVl-Ce36Ag7n7hs,5509
 py_near/exceptions/provider.py,sha256=K-wexgjPJ8sw42JePwaP7R5dJEIn9DoFJRvVcURsx6s,7718
 py_near/models.py,sha256=GZQD1TKGWlwqsJsKRXrVNBjCdAIpk7GQypU-QOtAPFs,11533
-py_near/providers.py,sha256=gNYPBWoYIO1Tqj2aPvBlJUrFvUZtCIo6o19o9ibOFxo,15986
+py_near/providers.py,sha256=1eg9MFIYIKA09bZyTdSZ2Umrh0kX1SUFEhY_tN8Cqz4,16722
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.43.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.43.dist-info/METADATA,sha256=3xDsCOdQv1EbiwaUX4pItm0bcgqm9X5xF_3-ifSUWfM,4713
-py_near-1.1.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py_near-1.1.43.dist-info/RECORD,,
+py_near-1.1.47.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.47.dist-info/METADATA,sha256=Nd8CpvwjXiIyN9WK4JdCs46PgRUExpRNnSXTW6javYE,4693
+py_near-1.1.47.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py_near-1.1.47.dist-info/RECORD,,