mech-client 0.2.18__py3-none-any.whl → 0.2.19__py3-none-any.whl

mech_client/__init__.py

@@ -1,3 +1,3 @@
 """Mech client."""
 
-__version__ = "0.2.18"
+__version__ = "0.2.19"

mech_client/helpers/acn/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

mech_client/helpers/acn/dialogues.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

mech_client/helpers/acn/message.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

mech_client/helpers/acn/protocol.yaml

@@ -8,13 +8,13 @@ license: Apache-2.0
 aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   README.md: bafybeie7paijucvzemlfhwfmmhorypwuhzbeimgoitlkokdio5c3ne4pjq
-  __init__.py: bafybeie6wesz6wnihjwdlbkhso6gtnpa4dkqdseb7susz2qseprlmcccam
+  __init__.py: bafybeicqlp4gkeeef5osp6zopjztlgat24nxrzq43cy7wbwxk5omf2sc2m
   acn.proto: bafybeidkun7o75sxpyk2sixt7dsykgty62f6dnixnes2irbunyamilqsh4
   acn_pb2.py: bafybeialafz3yomunwa3g5xgrdqwodzl7zg5dncvzuetv7xoew4zhw76ni
   custom_types.py: bafybeigpueuq6mdeyjyayzv3menkmemutfgfiwlozlpl64t67cfnnom24q
-  dialogues.py: bafybeih2kwxi34hcrxbb3cmhtpo5k5fc4hlgsb3qnifpyeefou63c4qc2a
-  message.py: bafybeibkjeytosfqptmqph3xwdcnmokgoen2xw2s44736potgrjr43vlmy
-  serialization.py: bafybeibbs5uepy6s5jb5eyzdav6i2hejy26zkocqe236kxmoknkqpsi7iu
+  dialogues.py: bafybeidjpyk7s3getyfegjdrgrt5blf2yutzqclohaktjehwcj3sqx2ole
+  message.py: bafybeiai7kond3rcbtwnr5xgpwzuauf5tusuep6ikopi4cqvp2wa5qfz3e
+  serialization.py: bafybeidu7fzixk6sm3iprhph4shbiq5qgvg56lg4yiryfaf3unuqk34bwi
   tests/__init__.py: bafybeidteufp2npjd77ekcftk5e4gbaquq3gike5nxtk5xfmnusls56keu
   tests/test_acn.py: bafybeignjgdtlfdnj25hc5necmg7zl3kvngsmzkjgcwfm5qg36liqa63ki
   tests/test_acn_dialogues.py: bafybeia2kndutaokjpogo4wlb5pf4gkqacvcbngqromf4g4mzu6wyetz7q

mech_client/helpers/acn/serialization.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

mech_client/helpers/p2p_libp2p_client/connection.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2022-2023 Valory AG
+#   Copyright 2022-2024 Valory AG
 #   Copyright 2018-2019 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -279,6 +279,7 @@ class P2PLibp2pClientConnection(Connection):
     connection_id = PUBLIC_ID
 
     DEFAULT_CONNECT_RETRIES = 3
+    DEFAULT_RESEND_ENVELOPE_RETRY = 1
     DEFAULT_TLS_CONNECTION_SIGNATURE_TIMEOUT = 5.0
 
     def __init__(self, **kwargs: Any) -> None:
@@ -292,6 +293,9 @@ class P2PLibp2pClientConnection(Connection):
         self.connect_retries = self.configuration.config.get(
             "connect_retries", self.DEFAULT_CONNECT_RETRIES
         )
+        self.resend_envelope_retry = self.configuration.config.get(
+            "resend_envelope_retry", self.DEFAULT_RESEND_ENVELOPE_RETRY
+        )
         ledger_id = self.configuration.config.get("ledger_id", DEFAULT_LEDGER)
         if ledger_id not in SUPPORTED_LEDGER_IDS:
             raise ValueError(  # pragma: nocover
@@ -386,11 +390,17 @@ class P2PLibp2pClientConnection(Connection):
             )
             await asyncio.shield(self.disconnect())
 
-    async def _send_envelope_with_node_client(self, envelope: Envelope) -> None:
+    async def _send_envelope_with_node_client(
+        self, envelope: Envelope, retry_counter: int = 0
+    ) -> None:
         """Send envelope with node client, reconnect and retry on fail."""
         if not self._node_client:  # pragma: nocover
             raise ValueError("Connection not connected to node!")
-
+        if retry_counter > self.resend_envelope_retry:
+            self.logger.warning(
+                f"Dropping envelope {envelope}. It failed after retry. "
+            )
+            return
         self._ensure_valid_envelope_for_external_comms(envelope)
         try:
             await self._node_client.send_envelope(envelope)
@@ -399,7 +409,7 @@ class P2PLibp2pClientConnection(Connection):
                 "Exception raised on message send. Try reconnect and send again."
             )
             await self._perform_connection_to_node()
-            await self._node_client.send_envelope(envelope)
+            await self._send_envelope_with_node_client(envelope, retry_counter + 1)
 
     async def connect(self) -> None:
         """Set up the connection."""
@@ -584,9 +594,14 @@ class P2PLibp2pClientConnection(Connection):
             envelope = await self._read_envelope_from_node()
             if self._in_queue is None:
                 raise ValueError("Input queue not initialized.")  # pragma: nocover
-            self._in_queue.put_nowait(envelope)
+            self.logger.debug(f"Received envelope: {envelope}")
             if envelope is None:
-                break  # pragma: no cover
+                # give it time to recover
+                # twice the amount what we wait for ACK timeouts
+                timeout = NodeClient.ACN_ACK_TIMEOUT * 2
+                await asyncio.sleep(timeout)
+                continue  # pragma: no cover
+            self._in_queue.put_nowait(envelope)
 
 
 class TCPSocketChannelClientTLS(TCPSocketChannelClient):

mech_client/helpers/p2p_libp2p_client/connection.yaml

@@ -10,14 +10,15 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   README.md: bafybeiaf5kdnfdc2jifojgniib76zl2c4utnx7ofewc3szqkrxsby62ulu
   __init__.py: bafybeid2azroxglu6fl7bxdfcsv3j77vyzgpikjnfwpxg73zeb5orez6ju
-  connection.py: bafybeiauso3ectgdvbhkt5j6wstfev5mnxiuj6hrkczyqgxurnvva3loqm
+  connection.py: bafybeihcwyo5nhxmsjxw7qrrvkvp7qu6izbgzgipmmnrpdvc6jtwmw7vgy
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- valory/acn:1.1.0:bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu
+- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe
 class_name: P2PLibp2pClientConnection
 config:
   connect_retries: 3
+  resend_envelope_retry: 1
   ledger_id: cosmos
   nodes:
   - uri: acn.staging.autonolas.tech:9005
@@ -29,15 +30,15 @@ cert_requests:
 - identifier: acn
   ledger_id: ethereum
   message_format: '{public_key}'
-  not_after: '2024-01-01'
-  not_before: '2023-01-01'
+  not_after: '2025-01-01'
+  not_before: '2024-01-01'
   public_key: 02d3a830c9d6ea1ae91936951430dee11f4662f33118b02190693be835359a9d77
   save_path: .certs/acn_cosmos_9005.txt
 - identifier: acn
   ledger_id: ethereum
   message_format: '{public_key}'
-  not_after: '2024-01-01'
-  not_before: '2023-01-01'
+  not_after: '2025-01-01'
+  not_before: '2024-01-01'
   public_key: 02e741c62d706e1dcf6986bf37fa74b98681bc32669623ac9ee6ff72488d4f59e8
   save_path: .certs/acn_cosmos_9006.txt
 excluded_protocols: []

{mech_client-0.2.18.dist-info → mech_client-0.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.2.18
+Version: 0.2.19
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch

{mech_client-0.2.18.dist-info → mech_client-0.2.19.dist-info}/RECORD

@@ -1,17 +1,17 @@
-mech_client/__init__.py,sha256=-FAy2CBMz87Vv1C1uGSsSXH1QrhOiCeSZFh3WR-Vjp8,43
+mech_client/__init__.py,sha256=2OIY2Ajb_pzPPnptauTqSi8S5jCYECPnMXEccSZuQu0,43
 mech_client/acn.py,sha256=Rj_jLPvJ5loDQfGbu3a_O24cJC4SwIErLceSz_zVYS8,5356
 mech_client/cli.py,sha256=cJ3QAP29QsbsyITVZbCVxZ7378ql2VPaEjar9Iotj0U,9555
 mech_client/configs/mechs.json,sha256=IABnne1lWi62l84Hzqh3XrP659uPKme2k32yAI0HBrg,4488
 mech_client/helpers/__init__.py,sha256=f13zpwGDaKQUjML-5Iq66rRfzg8IS5UNK5I8gBr7w54,1028
 mech_client/helpers/acn/README.md,sha256=WMXR2Lk0IpWjr3vpZ8cxcTHk4gwsx4wC06UPkwj9dbQ,1641
-mech_client/helpers/acn/__init__.py,sha256=72WrGEDIuYKvlWQnTajFQ9bNrDy2sFfTYDP62he4doI,1141
+mech_client/helpers/acn/__init__.py,sha256=3Yd1hUTcrtp0Kb1VmnOTC3_r-_69ozhzMqLlkNC6MkU,1141
 mech_client/helpers/acn/acn.proto,sha256=Ev0f8tQJjnTaK-mdpNLItVRgJ7VibtCeGBTcKz8nfX4,1543
 mech_client/helpers/acn/acn_pb2.py,sha256=NnS-rspsKz9ImoLWp8P9FSBNwGJYuj1mRCw8A1bHydQ,4350
 mech_client/helpers/acn/custom_types.py,sha256=x2YMQuxd86QDjkCr__SuhcDmlGP8qI-qJRg1XqIlBRw,7982
-mech_client/helpers/acn/dialogues.py,sha256=1z11RJW18_dC6gY1aLHiRfXPlZaABqt6n8u-FUgY2RY,4443
-mech_client/helpers/acn/message.py,sha256=LOAmYEaEYwKjYjTDZmAxR196v6jSVc9JAKF5vw2NbXk,10272
-mech_client/helpers/acn/protocol.yaml,sha256=gFs7lVa-FiTHSRdWUcB2lfJzcIQcJ9QeyMF6rxvWQ_M,1233
-mech_client/helpers/acn/serialization.py,sha256=yd3bmXkXFS4umv2i-Pa77381NdKzvrNUUkb-LEiiISE,6592
+mech_client/helpers/acn/dialogues.py,sha256=44IExYaKk9zxeu0L6G5grUUX62Px6Lv0Kfp8u56-uJs,4443
+mech_client/helpers/acn/message.py,sha256=d918VwybycjtwplngmPV-xbSRmgSwEHYFZnpC3xZz10,10272
+mech_client/helpers/acn/protocol.yaml,sha256=nA6sZ48dPR_3cmRb5BuaQbhHFA9uJkMlTnGmz9bbV_0,1233
+mech_client/helpers/acn/serialization.py,sha256=3vccK7L4i8ybtgYAUO7N550_6lTBV10EsT26qmCd2lM,6592
 mech_client/helpers/acn/tests/__init__.py,sha256=rIdXnZmrjQFe_nuseQ8CIOIELdYDihx9MNQehcbenYw,847
 mech_client/helpers/acn/tests/test_acn.py,sha256=wM1SZ4iW20PFNu-491KUFyuvICDM_EkjNLZxzguqO5w,8965
 mech_client/helpers/acn/tests/test_acn_dialogues.py,sha256=HWW7KO78lYzTEwMxFzOpdRh2LUaiBtrpUsjG3jfKuU8,1964
@@ -28,8 +28,8 @@ mech_client/helpers/acn_data_share/tests/test_acn_data_share_dialogues.py,sha256
 mech_client/helpers/acn_data_share/tests/test_acn_data_share_messages.py,sha256=j5H8SRCWh8hR_q5cTPTm7Q_l4L1uiuEUcTgpWDj-fTI,2021
 mech_client/helpers/p2p_libp2p_client/README.md,sha256=6x9s6P7TdKkcvAS1wMFHXRz4aIaLZhyi0OnUgbEvpKM,631
 mech_client/helpers/p2p_libp2p_client/__init__.py,sha256=-GOP3D_JnmXTDomrMLCbnRk7vRQmihIqTYvyIPzx-q4,879
-mech_client/helpers/p2p_libp2p_client/connection.py,sha256=pvfHtI-NhgDbay1wLNit6m8InH4c0p00c3hQo0I2jwQ,27887
-mech_client/helpers/p2p_libp2p_client/connection.yaml,sha256=giYV5FwwugD7ha9IqFHJtvs-Oz1jC5og9rpkstrTqoc,1763
+mech_client/helpers/p2p_libp2p_client/connection.py,sha256=b5jfcUeSoNrUw8DOSTCbK4DTi-N8bf2_pdogUOz0ep0,28606
+mech_client/helpers/p2p_libp2p_client/connection.yaml,sha256=nMiHnU_dv9EFjVNqZ-0SAnoATfadJSad-JsbDvk97Mk,1790
 mech_client/interact.py,sha256=nptUovTRJl7TxLjDW3sLIVMdGQfdBfQGMrW0Vh4XgO8,20879
 mech_client/mech_tool_management.py,sha256=XWQDcFStTK66-3ZzOwKtMo5c66KDjvbeDsIXHIP4SuU,7810
 mech_client/prompt_to_ipfs.py,sha256=XqSIBko15MEkpWOQNT97fRI6jNxMF5EDBDEPOJFdhyk,2533
@@ -37,8 +37,8 @@ mech_client/push_to_ipfs.py,sha256=IfvgaPU79N_ZmCPF9d7sPCYz2uduZH0KjT_HQ2LHXoQ,2
 mech_client/subgraph.py,sha256=4vY6QFyUVs15gS0SvanJbvAxb3aie07IuxQnfMMnStc,4931
 mech_client/to_png.py,sha256=pjUcFJ63MJj_r73eqnfqCWMtlpsrj6H4ZmgvIEmRcFw,2581
 mech_client/wss.py,sha256=hRInQjjsyOrs8dmgBb2VpJvpNt6Tx0aEiY3OhOPQvIs,6600
-mech_client-0.2.18.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-mech_client-0.2.18.dist-info/METADATA,sha256=OrF6KRAWhC4Eyh2ImmWZy5UgAOAbCR5Qq9eyTuZ6pmE,17682
-mech_client-0.2.18.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-mech_client-0.2.18.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
-mech_client-0.2.18.dist-info/RECORD,,
+mech_client-0.2.19.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+mech_client-0.2.19.dist-info/METADATA,sha256=8jIJGTtV9RoWG59SPZw5nFGs0PkmPQLi2ULZC7DoaHc,17682
+mech_client-0.2.19.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+mech_client-0.2.19.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
+mech_client-0.2.19.dist-info/RECORD,,