mech-client 0.3.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

mech_client/subgraph.py

@@ -48,12 +48,28 @@ DELIVER_QUERY_TEMPLATE = Template(
 """
 )
 DEFAULT_TIMEOUT = 600.0
+CHAIN_TO_ADDRESSES = {
+    "gnosis": {
+        3: "0xFf82123dFB52ab75C417195c5fDB87630145ae81",
+        6: "0x77af31De935740567Cf4fF1986D04B2c964A786a",
+        9: "0x552cea7bc33cbbeb9f1d90c1d11d2c6daeffd053",
+        11: "0x9aDe7A78A39B39a44b7a084923E93AA0B19Fd690",
+        19: "0x45b73d649c7b982548d5a6dd3d35e1c5c48997d0",
+    },
+    "base": {
+        1: "0x37C484cc34408d0F827DB4d7B6e54b8837Bf8BDA",
+        2: "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c",
+        3: "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c",
+    },
+    "arbitrum": {2: "0x1FDAD3a5af5E96e5a64Fc0662B1814458F114597"},
+    "polygon": {2: "0xbF92568718982bf65ee4af4F7020205dE2331a8a"},
+    "celo": {2: "0x230eD015735c0D01EA0AaD2786Ed6Bd3C6e75912"},
+    "optimism": {2: "0xDd40E7D93c37eFD860Bd53Ab90b2b0a8D05cf71a"},
+}
 
 
 def query_agent_address(  # pylint: disable=too-many-return-statements
     agent_id: int,
-    url: str,
-    timeout: Optional[float] = None,
     chain_config: Optional[str] = None,
 ) -> Optional[str]:
     """
@@ -61,44 +77,14 @@ def query_agent_address(  # pylint: disable=too-many-return-statements
 
     :param agent_id: The ID of the agent.
     :type agent_id: int
-    :param url: Subgraph URL.
-    :type url: str
-    :param timeout: Timeout for the request.
-    :type timeout: Optional[float]
     :type chain_config: Optional[str]:
     :return: The agent address if found, None otherwise.
     :rtype: Optional[str]
     """
     # temporary hard coded until subgraph present
-    if chain_config == "base" and agent_id == 1:
-        return "0x37C484cc34408d0F827DB4d7B6e54b8837Bf8BDA"
-    if chain_config == "base" and agent_id == 2:
-        return "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c"
-    if chain_config == "base" and agent_id == 3:
-        return "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c"
-    if chain_config == "arbitrum" and agent_id == 2:
-        return "0x1FDAD3a5af5E96e5a64Fc0662B1814458F114597"
-    if chain_config == "polygon" and agent_id == 2:
-        return "0xbF92568718982bf65ee4af4F7020205dE2331a8a"
-    if chain_config == "celo" and agent_id == 2:
-        return "0x230eD015735c0D01EA0AaD2786Ed6Bd3C6e75912"
-    if chain_config == "optimism" and agent_id == 2:
-        return "0xDd40E7D93c37eFD860Bd53Ab90b2b0a8D05cf71a"
-    client = Client(
-        transport=AIOHTTPTransport(url=url),
-        execute_timeout=timeout or 30.0,
-    )
-    response = client.execute(
-        document=gql(
-            request_string=AGENT_QUERY_TEMPLATE.substitute({"agent_id": agent_id})
-        )
-    )
-    mechs = response["createMeches"]  # pylint: disable=unsubscriptable-object
-    if len(mechs) == 0:
-        return None
-
-    (record,) = mechs
-    return record["mech"]
+    if not chain_config:
+        raise ValueError("Chain config not specified")
+    return CHAIN_TO_ADDRESSES.get(chain_config, {}).get(agent_id, None)
 
 
 async def query_deliver_hash(

mech_client/wss.py

@@ -23,7 +23,7 @@ import asyncio
 import json
 import time
 from concurrent.futures import ThreadPoolExecutor
-from typing import Any, Dict, cast
+from typing import Any, Dict, List, cast
 
 import websocket
 from aea.crypto.base import Crypto
@@ -143,11 +143,11 @@ def watch_for_request_id(  # pylint: disable=too-many-arguments
         return request_id
 
 
-def watch_for_marketplace_request_id(  # pylint: disable=too-many-arguments, unused-argument
+def watch_for_marketplace_request_ids(  # pylint: disable=too-many-arguments, unused-argument
     marketplace_contract: Web3Contract,
     ledger_api: EthereumApi,
     tx_hash: str,
-) -> str:
+) -> List[str]:
     """
     Watches for events on mech.
 
@@ -167,10 +167,11 @@ def watch_for_marketplace_request_id(  # pylint: disable=too-many-arguments, unu
             tx_receipt
         )
         if len(rich_logs) == 0:
-            return "Empty Logs"
+            return ["Empty Logs"]
 
-        request_id = rich_logs[0]["args"]["requestIds"][0]
-        return request_id.hex()
+        request_ids = rich_logs[0]["args"]["requestIds"]
+        request_ids_hex = [request_id.hex() for request_id in request_ids]
+        return request_ids_hex
 
 
 async def watch_for_data_url_from_wss(  # pylint: disable=too-many-arguments

{mech_client-0.3.0.dist-info → mech_client-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.3.0
+Version: 0.6.0
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch
@@ -16,6 +16,7 @@ Requires-Dist: open-aea-cli-ipfs (>=1.53.0,<2.0.0)
 Requires-Dist: open-aea-ledger-cosmos (>=1.53.0,<2.0.0)
 Requires-Dist: open-aea-ledger-ethereum (>=1.53.0,<2.0.0)
 Requires-Dist: open-aea[cli] (>=1.53.0,<2.0.0)
+Requires-Dist: setuptools (>=77.0.3,<78.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: websocket-client (>=0.32.0,<1)
 Description-Content-Type: text/markdown
@@ -143,15 +144,17 @@ export MECHX_API_KEY=<your api key>
 The basic usage of the Mech Client is as follows:
 
 ```bash
-mechx interact <prompt> --agent_id <agent_id>
+mechx interact --prompts <prompt> --tools <tool> --agent_id <agent_id>
 ```
 
-where agent with `<agent_id>` will process `<prompt>` with the default options. Each chain has its own set of Mech agents. You can find the agent IDs for each chain on the [Mech Hub](https://aimechs.autonolas.network/registry) or on the [Mech repository](https://github.com/valory-xyz/mech?tab=readme-ov-file#examples-of-deployed-mechs).
+where agent with `<agent_id>` will process `<prompt>` with the `<tool>` and default options. Each chain has its own set of Mech agents. You can find the agent IDs for each chain on the [Mech Hub](https://aimechs.autonolas.network/registry) or on the [Mech repository](https://github.com/valory-xyz/mech?tab=readme-ov-file#examples-of-deployed-mechs).
+
+⚠️ Batch requests and tools are not supported for legacy mechs
 
 Some useful options:
 
 - `--key <private_key_path>`: Specifies the path of the private key. The default value is `./ethereum_private_key.txt`.
-- `--tool  <name>`: Name of the tool to process the prompt. If you are aware about the tools that are provided by an agent you can directly provide its name using this option. If not provided, it will show a list of available tools for the agent so that you can select which one you want to use:
+- `--tools  <name>`: Name of the tool to process the prompt. If you are aware about the tools that are provided by an agent you can directly provide its name using this option. If not provided, it will show a list of available tools for the agent so that you can select which one you want to use:
 
   ```text
   Select prompting tool
@@ -177,12 +180,12 @@ Some useful options:
   - `on-chain`: Wait for the result using the Subgraph and the Websocket subscription (whichever arrives first).
   - `wait-for-both` (Default): Wait for the result using both `off-chain` and `on-chain` (whichever arrives first).
 
-### Example
+##### Example
 
 Example of a request specifying a key file and tool:
 
 ```bash
-mechx interact "write a short poem" --agent_id 6 --key ~/ethereum_private_key.txt --tool openai-gpt-3.5-turbo --chain-config gnosis --confirm on-chain
+mechx interact --prompts "write a short poem" --agent_id 6 --key ~/ethereum_private_key.txt --tools openai-gpt-3.5-turbo --chain-config gnosis --confirm on-chain
 ```
 
 You will see an output like this:
@@ -199,23 +202,53 @@ Data from agent: {'requestId': 1004074058566339663950817114309409628095686850319
 
 #### With the Mech Marketplace
 
-With the Mech Marketplace, the basic usage of the Mech Client is as follows.
+With the Mech Marketplace, in order to pay for the Mech fees, you can make a deposit before sending requests. The deposit depends on the 
+payment model of the Mech. For a fixed price Mech receiving payments in native token, use the following: 
+
+```bash
+mechx deposit-native --chain-config <chain_config> <amount>
+```
+
+For a fixed price Mech receiving payments in OLAS, use the following (the amount is in ether): 
 
 ```bash
-mechx interact <prompt> --tool openai-gpt-3.5-turbo --chain-config <chain_config>
+mechx deposit-token --chain-config <chain_config> <amount>
 ```
 
-To use a custom mech to send requests to, use the  `priority-mech` flag while sending the requests
+For a Mech using Nevermined subscriptions, to make requests, it is necessary to buy a subscription. To do that you can use the following command: 
+
+```bash 
+mechx purchase-nvm-subscription --chain-config <chain_config>
+```
+
+:warning: If you face issues with base RPC, please consider updating to a new one [here](https://github.com/valory-xyz/mech-client/blob/feat/nvm_sub_integration/scripts/nvm_subscription/resources/networks.json#L10).
+
+You can use the option `--key <private_key_file_path>` in order to customize the path to the private key file.
+
+The basic usage of the Mech Client is then as follows.
 
 ```bash
-mechx interact <prompt> --priority-mech <priority mech address> --tool openai-gpt-3.5-turbo --chain-config <chain_config>
+mechx interact --prompts <prompt> --priority-mech <priority mech address> --tools openai-gpt-3.5-turbo --chain-config <chain_config>
 ```
 
 Additionally to other options which are the same as for legacy Mechs, this usage has the following option:
 
-`--use-prepaid <bool>`: use the prepaid method to send requests to a Mech via the Mech Marketplace. Defaults to False.
+`--use-prepaid <bool>`: use the prepaid method to send requests to a Mech via the Mech Marketplace. Defaults to False. <br>
 `--use-offchain <bool>`: use the off-chain method to send requests to a Mech via the Mech Marketplace. Defaults to False.
 
+The Mech Client can also be used to send batch requests. There are couple of different ways to achieve this: 
+
+```bash
+mechx interact --prompts={<prompt-1>,<prompt-2>} --priority-mech <priority mech address> --tools={<tool-1>,<tool-2>} --chain-config <chain_config>
+```
+
+or <br>
+
+```bash
+mechx interact --prompts <prompt-1> --prompts <prompt-2> --priority-mech <priority mech address> --tools <tool-1> --tools <tool-2> --chain-config <chain_config>
+```
+
+
 ### List tools available for agents
 
 To list the tools available for a specific agent or for all agents, use the `tools-for-agents` command. You can specify an agent ID to get tools for a specific agent, or omit it to list tools for all agents.
@@ -336,7 +369,6 @@ Additionally, you can override any configuration parameter by exporting any of t
 MECHX_CHAIN_RPC
 MECHX_WSS_ENDPOINT
 MECHX_GAS_LIMIT
-MECHX_CONTRACT_ABI_URL
 MECHX_TRANSACTION_URL
 MECHX_SUBGRAPH_URL
 
@@ -476,7 +508,7 @@ You can find the agent IDs for each chain on the [Mech Hub](https://aimechs.auto
 Use the `--chain-config <name>` parameter together with a valid `<agent_id>`, for example:
 
 ```bash
-mechx interact "write a short poem" 2 --key ./ethereum_private_key.txt --tool openai-gpt-4 --chain-config celo --confirm on-chain
+mechx interact --prompts "write a short poem" --agent_id 2 --key ./ethereum_private_key.txt --tools openai-gpt-4 --chain-config celo --confirm on-chain
 ```
 
 </details>

{mech_client-0.3.0.dist-info → mech_client-0.6.0.dist-info}/RECORD

@@ -1,14 +1,34 @@
-mech_client/__init__.py,sha256=Fv_rB4SSlUfKkC4yVa0VynPADc604qwxEG5c-jAgNic,42
+mech_client/__init__.py,sha256=u1bXGPf2ZrokEsWfyYdYTo12ju14tZw8ZMC9qgLP3JU,42
+mech_client/abis/AgentMech.json,sha256=IEbs_xBGunBu5h-uT5DvIty8Zw412QoPI46S_DUMYNw,18082
+mech_client/abis/AgentRegistry.json,sha256=2qmXeFINZWz9pyOma6Bq67kMDSUI1lD7WvgHLwuETD8,24723
+mech_client/abis/AgreementStoreManager.base.json,sha256=_ljdIZcfFGmFzBHUTfhA4X0382ZHHpkdr_CziTwUETo,34360
+mech_client/abis/AgreementStoreManager.gnosis.json,sha256=JxftbiQDFF0bHm3Gtlaxvccmmx5-zHdzsKBFUn0rITY,34360
 mech_client/abis/BalanceTrackerFixedPriceNative.json,sha256=MF5jDqSMoZztvMV4oc5ij-Qn1DAZ1Nyz9EOFRb9wSQ0,12478
 mech_client/abis/BalanceTrackerFixedPriceToken.json,sha256=kaXgResUkAb6u9bVTS3T_SNRPRP76hi-jTAhMiYwq4U,12408
 mech_client/abis/BalanceTrackerNvmSubscriptionNative.json,sha256=D23ibyhDsn4vjozFvzcKw-7wJpGM-R5GiqlcmyBIpcY,16536
+mech_client/abis/BalanceTrackerNvmSubscriptionToken.json,sha256=4Bra0DdEi_pQUSD4hGdELOvjNL013GaJc-dANr--5D8,16204
+mech_client/abis/DIDRegistry.base.json,sha256=l6UZe4SU9nMh0PvmTS5gfwd6bBM7_BT5mRyASOFyGxw,92562
+mech_client/abis/DIDRegistry.gnosis.json,sha256=piDWd8nipLcI3NkMu0o2RsQkTS9m7gjDp-yLtPpcjEc,92562
+mech_client/abis/EscrowPaymentCondition.base.json,sha256=Z0zr_E2Cxjfg_aHF-VLPeOQ9kAy51_aRcw-OuIPQ7zY,34475
+mech_client/abis/EscrowPaymentCondition.gnosis.json,sha256=YkretgP3DKVpBZdeRqHu49oELQntuQk4-h852e4IIHQ,34475
 mech_client/abis/IERC1155.json,sha256=2xOx44MrKRk5oDEZ8PhCUgW7A4puK-GQizPKff-Fn1E,7459
 mech_client/abis/IMech.json,sha256=km0NMRyqBYh3jBQwPJCispsRfPwqNJ67kkZwYjuJci4,3989
 mech_client/abis/IToken.json,sha256=VrzR6Rr1DmrUzy5DygN1rKm6df4ir2KGdWsunZnuRKo,19637
+mech_client/abis/LockPaymentCondition.base.json,sha256=mGOi_xYyH7gCzLyWu7nk_Ta46tpLNxoPAgbjQvKNQtA,43424
+mech_client/abis/LockPaymentCondition.gnosis.json,sha256=ofYQo6JYSE_7Q4LPHxoOZI2qFMddSWcfVoCW-6k9KnY,43424
 mech_client/abis/MechMarketplace.json,sha256=auKTxPTi07yD98Gz2RuwH1Gq5qRCyy8-C7QBNj3uto8,32104
+mech_client/abis/NFTSalesTemplate.base.json,sha256=blheE2NNxCt3ttklcsAF9WrIcnsvywAZ8jICjGVl4lQ,37995
+mech_client/abis/NFTSalesTemplate.gnosis.json,sha256=6fKoxvTSQWOGQq_Yik09R8JTMRxXIPgoOC_HSAf5A7Q,37995
+mech_client/abis/NeverminedConfig.base.json,sha256=0p_GV87fsBvlN6VNDm_T1ykjzD4yZKlR9-jDpo1_RRU,21221
+mech_client/abis/NeverminedConfig.gnosis.json,sha256=3MT2dgUz5jAKvwItfHwz95VPvPwKxF3CG2rH8kE5eug,21221
+mech_client/abis/SubscriptionNFT.base.json,sha256=oYqkgejXaNQ2Pfc1OyWRJ7GlOl77B0UC16ziS6-Y76U,8811
+mech_client/abis/SubscriptionNFT.gnosis.json,sha256=vHW7ownS8qDcDLbLZMGthtLc8YdtyxaAvymfeizD-7o,8811
+mech_client/abis/SubscriptionToken.base.json,sha256=5StPEyfRvDMTqtQPO-KakXXZqobXZRuE6OCAeTM7bQc,39812
+mech_client/abis/TransferNFTCondition.base.json,sha256=71O_3itHBz9qPtoTLev8_a7KxlcQfIZSfxK2562lkqw,42540
+mech_client/abis/TransferNFTCondition.gnosis.json,sha256=-huhxV54eoNY8mR9WtQdmSgQDgaKiUi0PULJ4HEshWw,42540
 mech_client/acn.py,sha256=Rj_jLPvJ5loDQfGbu3a_O24cJC4SwIErLceSz_zVYS8,5356
-mech_client/cli.py,sha256=PWkUBwirP8DMxNG-lYmh-QAJhNPX_k6yCtfjTh7iXs8,11322
-mech_client/configs/mechs.json,sha256=ihF23WakBh1Jbnb45OJvPjDzZ572eud3s0Gx4qNGWwQ,5699
+mech_client/cli.py,sha256=cTmamHI-_DJL4NHfkF9Vv8DbaQm-5x3bTzrfKnyiBzg,14035
+mech_client/configs/mechs.json,sha256=Sh-W0ZqkktSD8HokU5InoFIlqvKoq7nDlIY0fB8P6Y8,4887
 mech_client/fetch_ipfs_hash.py,sha256=tg_hYVf4deXl89x3SOBrGFUthaSeN_Vg_OHDtfjdbp4,2752
 mech_client/helpers/__init__.py,sha256=nmQig1EqBQ9EMOpgdykP3a6_2NWcoVH3-lnyHP5n0ws,1196
 mech_client/helpers/acn/README.md,sha256=WMXR2Lk0IpWjr3vpZ8cxcTHk4gwsx4wC06UPkwj9dbQ,1641
@@ -38,16 +58,16 @@ 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=b5jfcUeSoNrUw8DOSTCbK4DTi-N8bf2_pdogUOz0ep0,28606
 mech_client/helpers/p2p_libp2p_client/connection.yaml,sha256=nMiHnU_dv9EFjVNqZ-0SAnoATfadJSad-JsbDvk97Mk,1790
-mech_client/interact.py,sha256=zQ7UhlnZOfM4hnZBaRQ5efkfw6Rl-s7Kh6lciyoZL70,22028
-mech_client/marketplace_interact.py,sha256=DgDU1xY2zJO3MfxkWNFtJ8iZkjGBfP8MYL4vAEDRKWE,31418
-mech_client/mech_tool_management.py,sha256=XWQDcFStTK66-3ZzOwKtMo5c66KDjvbeDsIXHIP4SuU,7810
+mech_client/interact.py,sha256=h3li0N79M1MaVXggONFzs_rNEr6WcG8fof_UtykSZyQ,21243
+mech_client/marketplace_interact.py,sha256=rRIHYLzuaXYW7vh4fvNh9KBbUY4tgoavmMxFaPg0Rkw,33045
+mech_client/mech_tool_management.py,sha256=NQFmVzzGZsIkeHokDPWXGHwa8u-pyQIMPR1Q5H81bKw,7806
 mech_client/prompt_to_ipfs.py,sha256=XqSIBko15MEkpWOQNT97fRI6jNxMF5EDBDEPOJFdhyk,2533
 mech_client/push_to_ipfs.py,sha256=IfvgaPU79N_ZmCPF9d7sPCYz2uduZH0KjT_HQ2LHXoQ,2059
-mech_client/subgraph.py,sha256=6hkF8l0qxWRJ0UcdxfML6JnjYBu5BuBA6EHsHJ2nHVI,5149
+mech_client/subgraph.py,sha256=MiyWiLPkqtXS9qayT75xYM6tz2pxd2Q6iE92yZxDugw,4700
 mech_client/to_png.py,sha256=pjUcFJ63MJj_r73eqnfqCWMtlpsrj6H4ZmgvIEmRcFw,2581
-mech_client/wss.py,sha256=toD_9-gNsQAoK13Zh5mQCKbmkT2Gcqz5XaNiUGyb5Js,9801
-mech_client-0.3.0.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-mech_client-0.3.0.dist-info/METADATA,sha256=2YFbNhpBXix_HZBGf-CSW7wspGdH53EQjqWjUK6PBLc,19911
-mech_client-0.3.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-mech_client-0.3.0.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
-mech_client-0.3.0.dist-info/RECORD,,
+mech_client/wss.py,sha256=N38eprKqwHyQpqGa6XZ9ZUwJ_YO50wlBJqJ5D1QCIj4,9888
+mech_client-0.6.0.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+mech_client-0.6.0.dist-info/METADATA,sha256=B8JraHl2kGrhhFxUkk9zZTS9ijCgpuIsK2O58p9kh4U,21369
+mech_client-0.6.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+mech_client-0.6.0.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
+mech_client-0.6.0.dist-info/RECORD,,