mech-client 0.2.9__py3-none-any.whl → 0.2.10__py3-none-any.whl

mech_client/__init__.py

@@ -1,3 +1,3 @@
 """Mech client."""
 
-__version__ = "0.2.9"
+__version__ = "0.2.10"

mech_client/interact.py

@@ -26,7 +26,6 @@ python client.py <prompt> <tool>
 """
 
 import asyncio
-import json
 import os
 import time
 import warnings
@@ -66,7 +65,7 @@ LEDGER_CONFIG = {
     "chain_id": 100,
     "poa_chain": False,
     "default_gas_price_strategy": "eip1559",
-    "is_gas_estimation_enabled": True,
+    "is_gas_estimation_enabled": False,
 }
 PRIVATE_KEY_FILE_PATH = "ethereum_private_key.txt"
 
@@ -74,7 +73,15 @@ WSS_ENDPOINT = os.getenv(
     "WEBSOCKET_ENDPOINT",
     "wss://rpc.eu-central-2.gateway.fm/ws/v4/gnosis/non-archival/mainnet",
 )
-GNOSISSCAN_API_URL = "https://api.gnosisscan.io/api?module=contract&action=getabi&address={contract_address}"
+MANUAL_GAS_LIMIT = int(
+    os.getenv(
+        "MANUAL_GAS_LIMIT",
+        "100_000",
+    )
+)
+BLOCKSCOUT_API_URL = (
+    "https://gnosis.blockscout.com/api/v2/smart-contracts/{contract_address}"
+)
 
 MAX_RETRIES = 3
 WAIT_SLEEP = 3.0
@@ -119,9 +126,9 @@ def get_event_signatures(abi: List) -> Tuple[str, str]:
 
 def get_abi(contract_address: str) -> List:
     """Get contract abi"""
-    abi_request_url = GNOSISSCAN_API_URL.format(contract_address=contract_address)
+    abi_request_url = BLOCKSCOUT_API_URL.format(contract_address=contract_address)
     response = requests.get(abi_request_url).json()
-    return json.loads(response["result"])
+    return response["abi"]
 
 
 def get_contract(
@@ -260,7 +267,11 @@ def send_request(  # pylint: disable=too-many-arguments,too-many-locals
     print(f"Prompt uploaded: https://gateway.autonolas.tech/ipfs/{v1_file_hash_hex}")
     method_name = "request"
     methord_args = {"data": v1_file_hash_hex_truncated}
-    tx_args = {"sender_address": crypto.address, "value": price}
+    tx_args = {
+        "sender_address": crypto.address,
+        "value": price,
+        "gas": MANUAL_GAS_LIMIT,
+    }
 
     tries = 0
     retries = retries or MAX_RETRIES
@@ -377,7 +388,7 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
     :type sleep: float
     :rtype: Any
     """
-    contract_address = query_agent_address(agent_id=agent_id)
+    contract_address = query_agent_address(agent_id=agent_id, timeout=timeout)
     if contract_address is None:
         raise ValueError(f"Agent with ID {agent_id} does not exist!")
 

mech_client/subgraph.py

@@ -37,16 +37,22 @@ AGENT_QUERY_TEMPLATE = Template(
 )
 
 
-def query_agent_address(agent_id: int) -> Optional[str]:
+def query_agent_address(
+    agent_id: int, timeout: Optional[float] = None
+) -> Optional[str]:
     """
     Query agent address from subgraph.
 
     :param agent_id: The ID of the agent.
+    :param timeout: Timeout for the request.
     :type agent_id: int
     :return: The agent address if found, None otherwise.
     :rtype: Optional[str]
     """
-    client = Client(transport=AIOHTTPTransport(url=MECH_SUBGRAPH_URL))
+    client = Client(
+        transport=AIOHTTPTransport(url=MECH_SUBGRAPH_URL),
+        execute_timeout=timeout or 30.0,
+    )
     response = client.execute(
         document=gql(
             request_string=AGENT_QUERY_TEMPLATE.substitute({"agent_id": agent_id})

{mech_client-0.2.9.dist-info → mech_client-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.2.9
+Version: 0.2.10
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch
@@ -12,10 +12,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: asn1crypto (>=1.4.0,<1.5.0)
 Requires-Dist: gql (>=3.4.1)
-Requires-Dist: open-aea-cli-ipfs (==1.42.0)
-Requires-Dist: open-aea-ledger-cosmos (==1.42.0)
-Requires-Dist: open-aea-ledger-ethereum (==1.42.0)
-Requires-Dist: open-aea[cli] (==1.42.0)
+Requires-Dist: open-aea-cli-ipfs (==1.50.0)
+Requires-Dist: open-aea-ledger-cosmos (==1.50.0)
+Requires-Dist: open-aea-ledger-ethereum (==1.50.0)
+Requires-Dist: open-aea[cli] (==1.50.0)
 Requires-Dist: websocket-client (>=0.32.0,<1)
 Description-Content-Type: text/markdown
 
@@ -54,7 +54,7 @@ Commands:
   push-to-ipfs    Upload a file to IPFS.
  ```
 
-## Usage:
+## CLI Usage:
 
 First, create a private key in file `ethereum_private_key.txt` with this command:
 
@@ -63,6 +63,12 @@ aea generate-key ethereum
 ```
 Ensure the private key carries funds on Gnosis Chain.
 
+A keyfile is just a file with your ethereum private key as a hex-string, example:
+```
+0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd
+```
+In case you add your own, make sure you don't have any extra characters in the file, like newlines or spaces.
+
 Second, run the following command to instruct the mech with `<prompt>` and `<agent_id>`:
 
 ```bash
@@ -115,6 +121,32 @@ Data arrived: https://gateway.autonolas.tech/ipfs/f0170122069b55e077430a00f3cbc3
 Data from agent: {'requestId': 81653153529124597849081567361606842861262371002932574194580478443414142139857, 'result': "\n\nA summer breeze, so sweet,\nA gentle reminder of summer's heat.\nThe sky so blue, no cloud in sight,\nA perfect day, a wondrous sight."}
 ```
 
+## Programmatic Usage:
+
+```python
+from mech_client.interact import interact, ConfirmationType
+
+prompt_text = 'Will gnosis pay reach 100k cards in 2024?'
+agent_id = 3
+tool_name = "prediction-online"
+
+result = interact(
+    prompt=prompt_text,
+    agent_id=agent_id,
+    tool=tool_name,
+    confirmation_type=ConfirmationType.ON_CHAIN,
+    private_key_path='PATH_HERE'
+)
+print(result)
+```
+
+# Developer installation
+To setup the development environment, run the following commands:
+
+```bash
+poetry install && poetry shell
+```
+
 ## Release guide:
 
 - Bump versions in `pyproject.toml` and `mech_client/__init__.py`
@@ -122,4 +154,5 @@ Data from agent: {'requestId': 8165315352912459784908156736160684286126237100293
 - `rm -rf dist`
 - `autonomy packages sync --update-packages`
 - `make eject-packages`
-- then `poetry publish --build --username=<username> --password=<password>`.
+- then create release PR and tag release
+

{mech_client-0.2.9.dist-info → mech_client-0.2.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mech_client/__init__.py,sha256=Bqj_mLyNm3Ms-GZCI16A17VdYk10lYULVsK0PFaXQTc,42
+mech_client/__init__.py,sha256=No9VVJJY-aVrNiGRM83B1m0Bb-fXIOl_diX4tfBS_BM,43
 mech_client/acn.py,sha256=Cz93ykB8Vavd6QSEBnoNv0wylfw2RLOqqu7fIYo4YRY,5790
 mech_client/cli.py,sha256=e6trIN_uoprbvxz41A-x2aUu8kxlyxTAfYv_yZzxmOU,3897
 mech_client/helpers/__init__.py,sha256=f13zpwGDaKQUjML-5Iq66rRfzg8IS5UNK5I8gBr7w54,1028
@@ -29,14 +29,14 @@ mech_client/helpers/p2p_libp2p_client/README.md,sha256=6x9s6P7TdKkcvAS1wMFHXRz4a
 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/interact.py,sha256=Rad_7wV9kHMXgCkAR-NRrcldA0dkmPLkMX4MipB8Hog,14791
+mech_client/interact.py,sha256=Dy0WiiATpp6jdPe5iJ14UzXAnRz13GbNjn_UOHugs8Y,14925
 mech_client/prompt_to_ipfs.py,sha256=IR0NHBd-f4p9bj_HuindJSwrGcc08fdBxavJmpo6GKA,2250
 mech_client/push_to_ipfs.py,sha256=IfvgaPU79N_ZmCPF9d7sPCYz2uduZH0KjT_HQ2LHXoQ,2059
-mech_client/subgraph.py,sha256=1ja0tTUVpTNGmmyXPPBHd-IJSxZgjQWlIEYWVN1iHEM,1815
+mech_client/subgraph.py,sha256=QR9yAxGSDQJDl3J3PeOwUYLMnCNMQyF4UZlNVTAKoMw,1955
 mech_client/to_png.py,sha256=pjUcFJ63MJj_r73eqnfqCWMtlpsrj6H4ZmgvIEmRcFw,2581
 mech_client/wss.py,sha256=a9aKz1WADxjx67zH8I48w9L_z8J1N2xWRrBrtyk-UjY,7353
-mech_client-0.2.9.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-mech_client-0.2.9.dist-info/METADATA,sha256=bTDfdctRoCD6rtbeEezx3tCjaWlb5Xk2nUuCvypl5mE,4823
-mech_client-0.2.9.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-mech_client-0.2.9.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
-mech_client-0.2.9.dist-info/RECORD,,
+mech_client-0.2.10.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+mech_client-0.2.10.dist-info/METADATA,sha256=bPnUfuqr6OX-vv73FqH-Z0Ssnadk0Z8HX5TeMRQCruY,5583
+mech_client-0.2.10.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+mech_client-0.2.10.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
+mech_client-0.2.10.dist-info/RECORD,,