hive-nectar 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

{hive_nectar-0.0.4.dist-info → hive_nectar-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hive-nectar
-Version: 0.0.4
+Version: 0.0.6
 Summary: Unofficial Python library for HIVE
 Project-URL: Homepage, http://www.github.com/thecrazygm/hive-nectar
 Project-URL: Download, https://github.com/thecrazygm/hive-nectar/tarball/0.00.01
@@ -54,6 +54,7 @@ Requires-Dist: pycryptodomex
 Requires-Dist: requests
 Requires-Dist: ruamel-yaml
 Requires-Dist: scrypt
+Requires-Dist: types-requests>=2.32.0.20250328
 Requires-Dist: websocket-client
 Description-Content-Type: text/markdown
 

{hive_nectar-0.0.4.dist-info → hive_nectar-0.0.6.dist-info}/RECORD

@@ -4,12 +4,12 @@ nectar/amount.py,sha256=Zpk-BAoRt1QjwO32CIBmXpCBIhyU1qHm_skYPjfboXg,18235
 nectar/asciichart.py,sha256=DwPyZAqne6o9L_PPRtlw6Xj0QdOZ-aId1lpOnmbyc6Q,8828
 nectar/asset.py,sha256=spGsJmlVQeZ6-oYhcwmQKsI3gpGmrpCzimYO1Qv4MtA,2725
 nectar/block.py,sha256=7nXVaYt8_tu9TJD6Zcr4Vo3owK8Rv8VKueWygawml3U,16064
-nectar/blockchain.py,sha256=BBXPc3UQ5kM-sjptQnvDosIhRXCK4gN3N1mXBSi1XzQ,49061
+nectar/blockchain.py,sha256=FflzDKS3ByWRnYiOOE94la6ZgJ0QHihnOpqD9qRi6_0,49159
 nectar/blockchaininstance.py,sha256=mrHuhHsR7h-becNe_bE8WieFqMFyz49s-LecmC_k134,93119
 nectar/blockchainobject.py,sha256=ZlWeOWGMoHyATgw20YfPV47OYlwuOpO75hmf0c9IC_4,7095
 nectar/blurt.py,sha256=cZoUyAdr_HdUTm8K3N-PyaFYfpBL_WmomFWeWTHbeIA,23070
 nectar/cli.py,sha256=jYi_EGZKeML7fvVX3g59uqWsUPL2e72NkxM4qFFrjLM,227475
-nectar/comment.py,sha256=bg-0TFHCudLX44YhQdCyAswFZfZzGJY4A4nTFbCATdA,46654
+nectar/comment.py,sha256=Hqj1TL9vKCWmDnBikVG8yCl7hgAwPBfqN_pkDsjtaxo,46791
 nectar/community.py,sha256=XyxIfdpIWart70MM2ojlZTfbKcRYr6qxGcWtEQNHfuI,17990
 nectar/constants.py,sha256=lrspBwCz9BE0YZY10DMS98oPwwxgmI0LzFdlQ7v53Ig,4974
 nectar/conveyor.py,sha256=dpvaVLaR48Tn56fkCUl5MoDQDcR3eLcrIKYm6ctZkRM,11265
@@ -32,18 +32,18 @@ nectar/steem.py,sha256=JwfO-dp7HT3mVEZVunHNp87gFbdO8e1tcpXQs_MygJ8,23916
 nectar/storage.py,sha256=yYsWc12fOUKEAkSn5wKGS-wSvsac3sMVn6uzLu_pn8c,1855
 nectar/transactionbuilder.py,sha256=j5PD3Wm_w9gHnKJ1Ug3sxz3RWPclWt-MQIO5ox027X8,25443
 nectar/utils.py,sha256=OGeLuO_nYDAvcX-onrm4xjn1L0binq8Glelgg6RdlSo,18882
-nectar/version.py,sha256=zDwHc53iG1aFz89YrYBMzTav_0YNKmKgekD_4NBZhsE,76
+nectar/version.py,sha256=x7maU-a8H7SAAs06_OW-iZAEZ1HvGWVdSaQbjWOSVBQ,76
 nectar/vote.py,sha256=sO_ukJMEcUO_WI-D2EwbAiiRLApRQ1fyiwyX7YSAiOk,20222
 nectar/wallet.py,sha256=pgbiLJbwXKMiR7EOtuVFee6s3nAdpILHVQ5iPNy7zhs,16222
 nectar/witness.py,sha256=88XYjhTRNhyu9hfIG0sm3Pg1hC9eooo3HhW5EhcaYps,23600
 nectarapi/__init__.py,sha256=c0J2Z-lHOvkSch9bZS3LVQZjKku2XxnYMZToq7OAkfI,157
 nectarapi/exceptions.py,sha256=FnS4-ywWDxEAtV65Hd-4XxAV7j1wRgtQRLIvIGxA0Xs,1824
-nectarapi/graphenerpc.py,sha256=H3u8ybNqa4RgWD4PqbfnEPkdCXOj1Mn3IGAyuUe4KdY,23495
+nectarapi/graphenerpc.py,sha256=7woRA4CmuwqYrJU9E4LV3UdxaANHzIrKuWZPaxTcJnw,22642
 nectarapi/node.py,sha256=mjK-fMFJ2icDaOUBoiUuDU-beo3aQK0HGwt0l0pC0YQ,5456
 nectarapi/noderpc.py,sha256=FxJz1KbjU6FbNdyp7ovOSZ8TbmD_xqQclKjeBP42Jls,10093
 nectarapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nectarapi/rpcutils.py,sha256=0nKCrEeNHFSEU3AjaOGNh-2pjc8qw4mRA9lCrBkP1FQ,2910
-nectarapi/version.py,sha256=zDwHc53iG1aFz89YrYBMzTav_0YNKmKgekD_4NBZhsE,76
+nectarapi/version.py,sha256=x7maU-a8H7SAAs06_OW-iZAEZ1HvGWVdSaQbjWOSVBQ,76
 nectarbase/__init__.py,sha256=U18vyJDvtsto3gHN9Fp3DHlcPd954sG06duHc72pNjs,234
 nectarbase/ledgertransactions.py,sha256=97WXhNhcjNDf_XjXDD08lBMzYmvHC63oZMLRQqVNvWY,2545
 nectarbase/memo.py,sha256=_-y9bxGr1DyEaD2-twVJ5Y-1ttFD-VJLyVAYzlT2ijw,7570
@@ -54,7 +54,7 @@ nectarbase/operations.py,sha256=K-ypT0KMcRPjcoOuYyUhpRaRUv5FtAhfdc7kSqbFyCs,4762
 nectarbase/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nectarbase/signedtransactions.py,sha256=r-MRnEQDnx6U6XFPcM3hPXiDZvU6sQVx4Vv_0nZF7fs,1792
 nectarbase/transactions.py,sha256=D7TK4Pkxr1N7p0Yh2bxvdXpOuEYpLl2tWK84Pj_93c0,319
-nectarbase/version.py,sha256=zDwHc53iG1aFz89YrYBMzTav_0YNKmKgekD_4NBZhsE,76
+nectarbase/version.py,sha256=x7maU-a8H7SAAs06_OW-iZAEZ1HvGWVdSaQbjWOSVBQ,76
 nectargrapheneapi/__init__.py,sha256=_Gxdt_qaQQwwYABHEFBuf4tMh93ItIa3HPBH9nk1PTw,151
 nectargrapheneapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nectargraphenebase/__init__.py,sha256=PzB_0qiWfqJku5vKQs0CpkVeipPmZ33Fpc1px4VCV-Q,570
@@ -76,7 +76,7 @@ nectargraphenebase/py23.py,sha256=aI1MAQ74DngxkjdpRlWEspmB1HNTQcpj3uHKo0b7rsM,78
 nectargraphenebase/signedtransactions.py,sha256=y5tq9ijO_EXUpn77cHgqx55RcsY0Jr-lwj_r_0w7OHI,6947
 nectargraphenebase/types.py,sha256=OZGVxgOoNPLiElNyDluUpmXNyREGzCEekZwq5uwPfGE,9771
 nectargraphenebase/unsignedtransactions.py,sha256=HwhbWkWS1mYCJWKMsUI18PogEmZ5sVTWLPwolvM6ZR0,9522
-nectargraphenebase/version.py,sha256=zDwHc53iG1aFz89YrYBMzTav_0YNKmKgekD_4NBZhsE,76
+nectargraphenebase/version.py,sha256=x7maU-a8H7SAAs06_OW-iZAEZ1HvGWVdSaQbjWOSVBQ,76
 nectarstorage/__init__.py,sha256=AQXmR8clT9bO9SnIM8QEr5S8ZOpbKuG_BnBsDmGvec0,1347
 nectarstorage/base.py,sha256=h7Oca1_RaJw39P1I_xXRKup016pS8zCLOs3e4IHKKdE,9734
 nectarstorage/exceptions.py,sha256=0erk_d0Ejia9td_Ke7XFBl17H1BxbM42gFpkej8EbV0,421
@@ -85,8 +85,8 @@ nectarstorage/masterpassword.py,sha256=nyG90LeHeqEjXVbRT36gAWGe-MxyKGCfQ8SqvytK1
 nectarstorage/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nectarstorage/ram.py,sha256=Cy6JbMrlgcEG673_KqfyaofhAdJR-luRKTedj3qTZEE,1034
 nectarstorage/sqlite.py,sha256=fkkDgi1lPv7lRo5wEAe4BzSVd2kDBGss3vCDYeNzDCs,10625
-hive_nectar-0.0.4.dist-info/METADATA,sha256=MD7UOEbMfErZE67n8BfBTgYmxSLfi0bpUFveBzHE_ng,6015
-hive_nectar-0.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hive_nectar-0.0.4.dist-info/entry_points.txt,sha256=DbqiJb5fFpQvGZ0ojvc2w3dXZitTg6FPz09CobKq4m8,47
-hive_nectar-0.0.4.dist-info/licenses/LICENSE.txt,sha256=WjJRNR4r7FuLEO2BTBLGa05T7bBecGGgH47NgKsSY0E,1158
-hive_nectar-0.0.4.dist-info/RECORD,,
+hive_nectar-0.0.6.dist-info/METADATA,sha256=pTDha7Q-J-O4yAJMXFs2FRPZnq8yH6xvMfGgZFfRI8w,6062
+hive_nectar-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hive_nectar-0.0.6.dist-info/entry_points.txt,sha256=DbqiJb5fFpQvGZ0ojvc2w3dXZitTg6FPz09CobKq4m8,47
+hive_nectar-0.0.6.dist-info/licenses/LICENSE.txt,sha256=WjJRNR4r7FuLEO2BTBLGa05T7bBecGGgH47NgKsSY0E,1158
+hive_nectar-0.0.6.dist-info/RECORD,,

nectar/blockchain.py

@@ -39,9 +39,7 @@ if not FUTURES_MODULE:
 # default exception handler. if you want to take some action on failed tasks
 # maybe add the task back into the queue, then make your own handler and pass it in
 def default_handler(name, exception, *args, **kwargs):
-    log.warn(
-        "%s raised %s with args %s and kwargs %s" % (name, str(exception), repr(args), repr(kwargs))
-    )
+    log.warning(f"{name} raised {exception} with args {args!r} and kwargs {kwargs!r}")
     pass
 
 
@@ -67,7 +65,7 @@ class Worker(Thread):
                 # get a task and raise immediately if none available
                 func, args, kwargs = self.queue.get(False)
                 self.idle.clear()
-            except:
+            except Exception:
                 # no work to do
                 # if not self.idle.is_set():
                 #  print >> stdout, '%s is idle' % self.name
@@ -175,7 +173,7 @@ class Pool:
                 # get a result, raises empty exception immediately if none available
                 results.append(self.resultQueue.get(False))
                 self.resultQueue.task_done()
-        except:
+        except Exception:
             return results
         return results
 
@@ -627,7 +625,9 @@ class Blockchain(object):
                                 )
 
                     if not bool(block_batch):
-                        raise BatchedCallsNotSupported()
+                        raise BatchedCallsNotSupported(
+                            f"{self.blockchain.rpc.url} Doesn't support batched calls"
+                        )
                     if not isinstance(block_batch, list):
                         block_batch = [block_batch]
                     for block in block_batch:

nectar/comment.py

@@ -231,8 +231,6 @@ class Comment(BlockchainObject):
             output["json_metadata"] = json.dumps(output["json_metadata"], separators=[",", ":"])
         if "tags" in output:
             output.pop("tags")
-        if "community" in output:
-            output.pop("community")
         parse_times = [
             "active",
             "cashout_time",
@@ -317,6 +315,14 @@ class Comment(BlockchainObject):
         else:
             return ""
 
+    @property
+    def community_title(self):
+        """The Community title property."""
+        if "community_title" in self:
+            return self["community_title"]
+        else:
+            return ""
+
     @property
     def parent_author(self):
         if "parent_author" in self:

nectar/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.4"
+version = "0.0.6"

nectarapi/graphenerpc.py

@@ -46,7 +46,7 @@ log = logging.getLogger(__name__)
 
 
 class SessionInstance(object):
-    """Singelton for the Session Instance"""
+    """Singleton for the Session Instance"""
 
     instance = None
 
@@ -59,7 +59,7 @@ def set_session_instance(instance):
 def shared_session_instance():
     """Get session instance"""
     if REQUEST_MODULE is None:
-        raise Exception()
+        raise Exception("Requests module is not available.")
     if not SessionInstance.instance:
         SessionInstance.instance = requests.Session()
     return SessionInstance.instance
@@ -68,7 +68,7 @@ def shared_session_instance():
 def create_ws_instance(use_ssl=True, enable_multithread=True):
     """Get websocket instance"""
     if WEBSOCKET_MODULE is None:
-        raise Exception()
+        raise Exception("WebSocket module is not available.")
     if use_ssl:
         ssl_defaults = ssl.get_default_verify_paths()
         sslopt_ca_certs = {"ca_certs": ssl_defaults.cafile}
@@ -79,47 +79,24 @@ def create_ws_instance(use_ssl=True, enable_multithread=True):
 
 class GrapheneRPC(object):
     """
-    This class allows to call API methods synchronously, without callbacks.
+    This class allows calling API methods synchronously, without callbacks.
 
     It logs warnings and errors.
 
     :param str urls: Either a single Websocket/Http URL, or a list of URLs
     :param str user: Username for Authentication
     :param str password: Password for Authentication
-    :param int num_retries: Try x times to num_retries to a node on disconnect, -1 for indefinitely (default is 100)
-    :param int num_retries_call: Repeat num_retries_call times a rpc call on node error (default is 5)
-    :param int timeout: Timeout setting for https nodes (default is 60)
-    :param bool autoconnect: When set to false, connection is performed on the first rpc call (default is True)
-    :param bool use_condenser: Use the old condenser_api rpc protocol on nodes with version
-        0.19.4 or higher. The settings has no effect on nodes with version of 0.19.3 or lower.
-    :param bool use_tor: When set to true, 'socks5h://localhost:9050' is set as proxy
-    :param dict custom_chains: custom chain which should be added to the known chains
-
-    Available APIs:
-
-          * database
-          * network_node
-          * network_broadcast
-
-    Usage:
-
-        .. code-block:: python
-
-            from nectarapi.graphenerpc import GrapheneRPC
-            ws = GrapheneRPC("wss://steemd.pevo.science","","")
-            print(ws.get_account_count())
-
-            ws = GrapheneRPC("https://api.steemit.com","","")
-            print(ws.get_account_count())
-
-    .. note:: This class allows to call methods available via
-              websocket. If you want to use the notification
-              subsystem, please use ``GrapheneWebsocket`` instead.
-
+    :param int num_retries: Number of retries for node connection (default is 100)
+    :param int num_retries_call: Number of retries for RPC calls on node error (default is 5)
+    :param int timeout: Timeout setting for HTTP nodes (default is 60)
+    :param bool autoconnect: Automatically connect on initialization (default is True)
+    :param bool use_condenser: Use the old condenser_api RPC protocol
+    :param bool use_tor: Use Tor proxy for connections
+    :param dict custom_chains: Custom chains to add to known chains
     """
 
     def __init__(self, urls, user=None, password=None, **kwargs):
-        """Init."""
+        """Initialize the RPC client."""
         self.rpc_methods = {"offline": -1, "ws": 0, "jsonrpc": 1, "wsappbase": 2, "appbase": 3}
         self.current_rpc = self.rpc_methods["ws"]
         self._request_id = 0
@@ -454,11 +431,12 @@ class GrapheneRPC(object):
         :raises ValueError: if the server does not respond in proper JSON format
         :raises RPCError: if the server returns an error
         """
-        log.debug(json.dumps(payload))
+        log.debug(f"Payload: {json.dumps(payload)}")
         if self.nodes.working_nodes_count == 0:
-            raise WorkingNodeMissing
+            raise WorkingNodeMissing("No working nodes available.")
         if self.url is None:
             raise RPCConnection("RPC is not connected!")
+
         reply = {}
         response = None
         while True:
@@ -488,13 +466,9 @@ class GrapheneRPC(object):
             except KeyboardInterrupt:
                 raise
             except WebSocketConnectionClosedException as e:
-                if self.nodes.num_retries_call_reached:
-                    self.nodes.increase_error_cnt()
-                    self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
-                    self.rpcconnect()
-                else:
-                    # self.nodes.sleep_and_check_retries(str(e), sleep=True, call_retry=True)
-                    self.rpcconnect(next_url=False)
+                self.nodes.increase_error_cnt()
+                self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
+                self.rpcconnect()
             except ConnectionError as e:
                 self.nodes.increase_error_cnt()
                 self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
@@ -508,48 +482,47 @@ class GrapheneRPC(object):
                 self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
                 self.rpcconnect()
 
-        ret = {}
         try:
             if response is None:
-                ret = json.loads(reply, strict=False, encoding="utf-8")
+                try:
+                    ret = json.loads(reply, strict=False)
+                except ValueError:
+                    log.error(f"Non-JSON response: {reply} Node: {self.url}")
+                    self._check_for_server_error(reply)
+                    raise RPCError("Invalid response format")
             else:
                 ret = response.json()
         except ValueError:
             self._check_for_server_error(reply)
 
-        log.debug(json.dumps(reply))
+        log.debug(f"Reply: {json.dumps(reply)}")
 
         if isinstance(ret, dict) and "error" in ret:
-            if "detail" in ret["error"]:
-                raise RPCError(ret["error"]["detail"])
-            else:
-                raise RPCError(ret["error"]["message"])
-        else:
-            if isinstance(ret, list):
-                ret_list = []
-                for r in ret:
-                    if isinstance(r, dict) and "error" in r:
-                        if "detail" in r["error"]:
-                            raise RPCError(r["error"]["detail"])
-                        else:
-                            raise RPCError(r["error"]["message"])
-                    elif isinstance(r, dict) and "result" in r:
-                        ret_list.append(r["result"])
-                    else:
-                        ret_list.append(r)
-                self.nodes.reset_error_cnt_call()
-                return ret_list
-            elif isinstance(ret, dict) and "result" in ret:
-                self.nodes.reset_error_cnt_call()
-                return ret["result"]
-            elif isinstance(ret, int):
-                raise RPCError(
-                    "Client returned invalid format. Expected JSON! Output: %s" % (str(ret))
+            if isinstance(ret["error"], dict):
+                error_message = ret["error"].get(
+                    "detail", ret["error"].get("message", "Unknown error")
                 )
-            else:
-                self.nodes.reset_error_cnt_call()
-                return ret
-        return ret
+                raise RPCError(error_message)
+        elif isinstance(ret, list):
+            ret_list = []
+            for r in ret:
+                if isinstance(r, dict) and "error" in r:
+                    error_message = r["error"].get(
+                        "detail", r["error"].get("message", "Unknown error")
+                    )
+                    raise RPCError(error_message)
+                elif isinstance(r, dict) and "result" in r:
+                    ret_list.append(r["result"])
+                else:
+                    ret_list.append(r)
+            self.nodes.reset_error_cnt_call()
+            return ret_list
+        elif isinstance(ret, dict) and "result" in ret:
+            self.nodes.reset_error_cnt_call()
+            return ret["result"]
+        else:
+            log.error(f"Unexpected response format: {ret} Node: {self.url}")
+            raise RPCError(f"Unexpected response format: {ret}")
 
     # End of Deprecated methods
     ####################################################################

nectarapi/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.4"
+version = "0.0.6"

nectarbase/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.4"
+version = "0.0.6"

nectargraphenebase/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.4"
+version = "0.0.6"