mech-client 0.4.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

mech_client/marketplace_interact.py

@@ -55,7 +55,7 @@ from mech_client.wss import (
     register_event_handlers,
     wait_for_receipt,
     watch_for_marketplace_data_url_from_wss,
-    watch_for_marketplace_request_id,
+    watch_for_marketplace_request_ids,
 )
 
 
@@ -73,6 +73,7 @@ class PaymentType(Enum):
     )
 
 
+IPFS_URL_TEMPLATE = "https://gateway.autonolas.tech/ipfs/f01701220{}"
 ABI_DIR_PATH = Path(__file__).parent / "abis"
 IMECH_ABI_PATH = ABI_DIR_PATH / "IMech.json"
 ITOKEN_ABI_PATH = ABI_DIR_PATH / "IToken.json"
@@ -96,26 +97,22 @@ PAYMENT_TYPE_TO_ABI_PATH: Dict[str, Path] = {
     PaymentType.TOKEN_NVM.value: BALANCE_TRACKER_NVM_TOKEN_ABI_PATH,
 }
 
-CHAIN_TO_WRAPPED_TOKEN = {
-    1: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-    10: "0x4200000000000000000000000000000000000006",
-    100: "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d",
-    137: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
-    8453: "0x4200000000000000000000000000000000000006",
-    42220: "0x471EcE3750Da237f93B8E339c536989b8978a438",
+CHAIN_TO_PRICE_TOKEN = {
+    1: "0x0001A500A6B18995B03f44bb040A5fFc28E45CB0",
+    10: "0xFC2E6e6BCbd49ccf3A5f029c79984372DcBFE527",
+    100: "0xcE11e14225575945b8E6Dc0D4F2dD4C570f79d9f",
+    137: "0xFEF5d947472e72Efbb2E388c730B7428406F2F95",
+    8453: "0x54330d28ca3357F294334BDC454a032e7f353416",
+    42220: "0xFEF5d947472e72Efbb2E388c730B7428406F2F95",
 }
 
 
 CHAIN_TO_DEFAULT_MECH_MARKETPLACE_REQUEST_CONFIG = {
     100: {
-        "mech_marketplace_contract": "0x735FAAb1c4Ec41128c367AFb5c3baC73509f70bB",
-        "priority_mech_address": "0x478ad20eD958dCC5AD4ABa6F4E4cc51e07a840E4",
         "response_timeout": 300,
         "payment_data": "0x",
     },
     8453: {
-        "mech_marketplace_contract": "0xf24eE42edA0fc9b33B7D41B06Ee8ccD2Ef7C5020",
-        "priority_mech_address": "0xE183610A420dBD8825fed49C589Fe2d5BFd5b17a",
         "response_timeout": 300,
         "payment_data": "0x",
     },
@@ -280,8 +277,8 @@ def send_marketplace_request(  # pylint: disable=too-many-arguments,too-many-loc
     ledger_api: EthereumApi,
     marketplace_contract: Web3Contract,
     gas_limit: int,
-    prompt: str,
-    tool: str,
+    prompts: tuple,
+    tools: tuple,
     method_args_data: MechMarketplaceRequestConfig,
     extra_attributes: Optional[Dict[str, Any]] = None,
     price: int = 10_000_000_000_000_000,
@@ -300,10 +297,10 @@ def send_marketplace_request(  # pylint: disable=too-many-arguments,too-many-loc
     :type marketplace_contract: Web3Contract
     :param gas_limit: Gas limit.
     :type gas_limit: int
-    :param prompt: The request prompt.
-    :type prompt: str
-    :param tool: The requested tool.
-    :type tool: str
+    :param prompts: The request prompts.
+    :type prompts: tuple
+    :param tools: The requested tools.
+    :type tools: tuple
     :param method_args_data: Method data to use to call the marketplace contract request
     :type method_args_data: MechMarketplaceRequestConfig
     :param extra_attributes: Extra attributes to be included in the request metadata.
@@ -319,21 +316,40 @@ def send_marketplace_request(  # pylint: disable=too-many-arguments,too-many-loc
     :return: The transaction hash.
     :rtype: Optional[str]
     """
-    v1_file_hash_hex_truncated, v1_file_hash_hex = push_metadata_to_ipfs(
-        prompt, tool, extra_attributes
-    )
-    print(
-        f"  - Prompt uploaded: https://gateway.autonolas.tech/ipfs/{v1_file_hash_hex}"
-    )
-    method_name = "request"
+    num_requests = len(prompts)
+
     method_args = {
-        "requestData": v1_file_hash_hex_truncated,
         "maxDeliveryRate": method_args_data.delivery_rate,
         "paymentType": "0x" + cast(str, method_args_data.payment_type),
         "priorityMech": to_checksum_address(method_args_data.priority_mech_address),
         "responseTimeout": method_args_data.response_timeout,
         "paymentData": method_args_data.payment_data,
     }
+
+    if num_requests == 1:
+        v1_file_hash_hex_truncated, v1_file_hash_hex = push_metadata_to_ipfs(
+            prompts[0], tools[0], extra_attributes
+        )
+        print(
+            f"  - Prompt uploaded: https://gateway.autonolas.tech/ipfs/{v1_file_hash_hex}"
+        )
+        method_name = "request"
+        method_args["requestData"] = v1_file_hash_hex_truncated
+
+    else:
+        request_datas = []
+        for prompt, tool in zip(prompts, tools):
+            v1_file_hash_hex_truncated, v1_file_hash_hex = push_metadata_to_ipfs(
+                prompt, tool, extra_attributes
+            )
+            print(
+                f"  - Prompt uploaded: https://gateway.autonolas.tech/ipfs/{v1_file_hash_hex}"
+            )
+            request_datas.append(v1_file_hash_hex_truncated)
+
+        method_name = "requestBatch"
+        method_args["requestDatas"] = request_datas
+
     tx_args = {
         "sender_address": crypto.address,
         "value": price,
@@ -376,6 +392,7 @@ def send_offchain_marketplace_request(  # pylint: disable=too-many-arguments,too
     prompt: str,
     tool: str,
     method_args_data: MechMarketplaceRequestConfig,
+    nonce: int,
     extra_attributes: Optional[Dict[str, Any]] = None,
     retries: Optional[int] = None,
     timeout: Optional[float] = None,
@@ -394,6 +411,8 @@ def send_offchain_marketplace_request(  # pylint: disable=too-many-arguments,too
     :type tool: str
     :param method_args_data: Method data to use to call the marketplace contract request
     :type method_args_data: MechMarketplaceRequestConfig
+    :param nonce: Nonce to use to order offchain tasks
+    :type nonce: int
     :param extra_attributes: Extra attributes to be included in the request metadata.
     :type extra_attributes: Optional[Dict[str,Any]]
     :param retries: Number of retries for sending a transaction
@@ -429,7 +448,6 @@ def send_offchain_marketplace_request(  # pylint: disable=too-many-arguments,too
     while tries < retries and datetime.now().timestamp() < deadline:
         tries += 1
         try:
-            nonce = marketplace_contract.functions.mapNonces(crypto.address).call()
             delivery_rate = method_args["maxDeliveryRate"]
             request_id = marketplace_contract.functions.getRequestId(
                 method_args["priorityMech"],
@@ -616,11 +634,11 @@ def check_prepaid_balances(
 
 
 def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals, too-many-statements, too-many-return-statements
-    prompt: str,
+    prompts: tuple,
     priority_mech: str,
     use_prepaid: bool = False,
     use_offchain: bool = False,
-    tool: str = "",
+    tools: tuple = (),
     extra_attributes: Optional[Dict[str, Any]] = None,
     private_key_path: Optional[str] = None,
     confirmation_type: ConfirmationType = ConfirmationType.WAIT_FOR_BOTH,
@@ -632,16 +650,16 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
     """
     Interact with mech marketplace contract.
 
-    :param prompt: The interaction prompt.
-    :type prompt: str
+    :param prompts: The interaction prompts.
+    :type prompts: tuple
     :param priority_mech: Priority mech address to use (Optional)
     :type priority_mech: str
     :param use_prepaid: Whether to use prepaid model or not.
     :type use_prepaid: bool
     :param use_offchain: Whether to use offchain model or not.
     :type use_offchain: bool
-    :param tool: The tool to interact with (optional).
-    :type tool: str
+    :param tools: The tools to interact with (optional).
+    :type tools: tuple
     :param extra_attributes: Extra attributes to be included in the request metadata (optional).
     :type extra_attributes: Optional[Dict[str, Any]]
     :param private_key_path: The path to the private key file (optional).
@@ -665,21 +683,23 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
     priority_mech_address = priority_mech
     mech_marketplace_contract = mech_config.mech_marketplace_contract
     chain_id = ledger_config.chain_id
+    num_requests = len(prompts)
 
     if mech_marketplace_contract == ADDRESS_ZERO:
         print(f"Mech Marketplace not yet supported on {chain_config}")
         return None
 
     config_values = CHAIN_TO_DEFAULT_MECH_MARKETPLACE_REQUEST_CONFIG[chain_id].copy()
-    if priority_mech_address is not None:
-        print("Custom Mech detected")
-        config_values.update(
-            {
-                "priority_mech_address": priority_mech_address,
-                "mech_marketplace_contract": mech_marketplace_contract,
-            }
-        )
+    if priority_mech_address is None:
+        print("Priority Mech Address not provided")
+        return None
 
+    config_values.update(
+        {
+            "priority_mech_address": priority_mech_address,
+            "mech_marketplace_contract": mech_marketplace_contract,
+        }
+    )
     mech_marketplace_request_config: MechMarketplaceRequestConfig = make_dataclass(
         "MechMarketplaceRequestConfig",
         ((k, type(v)) for k, v in config_values.items()),
@@ -740,12 +760,12 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
     )
 
     if not use_prepaid:
-        price = max_delivery_rate
+        price = max_delivery_rate * num_requests
         if payment_type == PaymentType.TOKEN.value:
             print("Token Mech detected, approving wrapped token for price payment...")
-            wxdai = CHAIN_TO_WRAPPED_TOKEN[chain_id]
+            price_token = CHAIN_TO_PRICE_TOKEN[chain_id]
             approve_tx = approve_price_tokens(
-                crypto, ledger_api, wxdai, mech_payment_balance_tracker, price
+                crypto, ledger_api, price_token, mech_payment_balance_tracker, price
             )
             if not approve_tx:
                 print("Unable to approve allowance")
@@ -799,8 +819,8 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
             marketplace_contract=mech_marketplace_contract,
             gas_limit=mech_config.gas_limit,
             price=price,
-            prompt=prompt,
-            tool=tool,
+            prompts=prompts,
+            tools=tools,
             method_args_data=mech_marketplace_request_config,
             extra_attributes=extra_attributes,
             retries=retries,
@@ -818,66 +838,86 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
         print(f"  - Transaction sent: {transaction_url_formatted}")
         print("  - Waiting for transaction receipt...")
 
-        request_id = watch_for_marketplace_request_id(
+        request_ids = watch_for_marketplace_request_ids(
             marketplace_contract=mech_marketplace_contract,
             ledger_api=ledger_api,
             tx_hash=transaction_digest,
         )
-        request_id_int = int.from_bytes(bytes.fromhex(request_id), byteorder="big")
-        print(f"  - Created on-chain request with ID {request_id_int}")
+        request_id_ints = [
+            int.from_bytes(bytes.fromhex(request_id), byteorder="big")
+            for request_id in request_ids
+        ]
+        if len(request_id_ints) == 1:
+            print(f"  - Created on-chain request with ID {request_id_ints[0]}")
+        else:
+            print(
+                f"  - Created on-chain requests with IDs: {', '.join(str(rid) for rid in request_id_ints)}"
+            )
         print("")
 
-        data_url = wait_for_marketplace_data_url(
-            request_id=request_id,
-            wss=wss,
-            mech_contract=mech_contract,
-            subgraph_url=mech_config.subgraph_url,
-            deliver_signature=marketplace_deliver_event_signature,
-            ledger_api=ledger_api,
-            crypto=crypto,
-            confirmation_type=confirmation_type,
-        )
+        for request_id, request_id_int in zip(request_ids, request_id_ints):
+            data_url = wait_for_marketplace_data_url(
+                request_id=request_id,
+                wss=wss,
+                mech_contract=mech_contract,
+                subgraph_url=mech_config.subgraph_url,
+                deliver_signature=marketplace_deliver_event_signature,
+                ledger_api=ledger_api,
+                crypto=crypto,
+                confirmation_type=confirmation_type,
+            )
 
-        if data_url:
-            print(f"  - Data arrived: {data_url}")
-            data = requests.get(f"{data_url}/{request_id_int}", timeout=30).json()
-            print("  - Data from agent:")
-            print(json.dumps(data, indent=2))
-            return data
+            if data_url:
+                print(f"  - Data arrived: {data_url}")
+                data = requests.get(f"{data_url}/{request_id_int}", timeout=30).json()
+                print("  - Data from agent:")
+                print(json.dumps(data, indent=2))
         return None
 
     print("Sending Offchain Mech Marketplace request...")
-    response = send_offchain_marketplace_request(
-        crypto=crypto,
-        marketplace_contract=mech_marketplace_contract,
-        prompt=prompt,
-        tool=tool,
-        method_args_data=mech_marketplace_request_config,
-        extra_attributes=extra_attributes,
-        retries=retries,
-        timeout=timeout,
-        sleep=sleep,
-    )
+    curr_nonce = mech_marketplace_contract.functions.mapNonces(crypto.address).call()  # type: ignore
+    responses = []
+
+    for i in range(num_requests):
+        response = send_offchain_marketplace_request(
+            crypto=crypto,
+            marketplace_contract=mech_marketplace_contract,
+            prompt=prompts[0],
+            tool=tools[0],
+            method_args_data=mech_marketplace_request_config,
+            nonce=curr_nonce + i,
+            extra_attributes=extra_attributes,
+            retries=retries,
+            timeout=timeout,
+            sleep=sleep,
+        )
+        responses.append(response)
 
-    if not response:
+    if not responses and len(responses) != num_requests:
         return None
 
-    request_id = response["request_id"]
-    print(f"  - Created off-chain request with ID {request_id}")
+    request_ids = [resp["request_id"] for resp in responses if resp is not None]
+    if len(request_ids) == 1:
+        print(f"  - Created off-chain request with ID {request_ids[0]}")
+    else:
+        print(
+            f"  - Created off-chain requests with IDs: {', '.join(str(rid) for rid in request_ids)}"
+        )
     print("")
 
     # @note as we are directly querying data from done task list, we get the full data instead of the ipfs hash
     print("Waiting for Offchain Mech Marketplace deliver...")
-    data = wait_for_offchain_marketplace_data(
-        request_id=request_id,
-    )
 
-    if data:
-        task_result = data["task_result"]
-        data_url = f"https://gateway.autonolas.tech/ipfs/f01701220{task_result}"
-        print(f"  - Data arrived: {data_url}")
-        data = requests.get(f"{data_url}/{request_id}", timeout=30).json()
-        print("  - Data from agent:")
-        print(json.dumps(data, indent=2))
-        return data
+    for request_id in request_ids:
+        data = wait_for_offchain_marketplace_data(
+            request_id=request_id,
+        )
+
+        if data:
+            task_result = data["task_result"]
+            data_url = IPFS_URL_TEMPLATE.format(task_result)
+            print(f"  - Data arrived: {data_url}")
+            data = requests.get(f"{data_url}/{request_id}", timeout=30).json()
+            print("  - Data from agent:")
+            print(json.dumps(data, indent=2))
     return None

mech_client/mech_tool_management.py

@@ -7,7 +7,13 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 import requests
 from aea_ledger_ethereum import EthereumApi
 
-from mech_client.interact import fetch_tools, get_abi, get_contract, get_mech_config
+from mech_client.interact import (
+    AGENT_REGISTRY_ABI_PATH,
+    fetch_tools,
+    get_abi,
+    get_contract,
+    get_mech_config,
+)
 
 
 def get_total_supply(chain_config: str = "gnosis") -> int:
@@ -27,7 +33,7 @@ def get_total_supply(chain_config: str = "gnosis") -> int:
     ledger_api = EthereumApi(**asdict(ledger_config))
 
     # Fetch ABI and create contract instance
-    abi = get_abi(mech_config.agent_registry_contract, mech_config.contract_abi_url)
+    abi = get_abi(AGENT_REGISTRY_ABI_PATH)
     contract = get_contract(mech_config.agent_registry_contract, abi, ledger_api)
 
     # Call the totalSupply function
@@ -58,7 +64,7 @@ def get_agent_tools(
             agent_id=agent_id,
             ledger_api=ledger_api,
             agent_registry_contract=mech_config.agent_registry_contract,
-            contract_abi_url=mech_config.contract_abi_url,
+            contract_abi_path=AGENT_REGISTRY_ABI_PATH,
             include_metadata=include_metadata,
         )
     except (requests.exceptions.RequestException, json.JSONDecodeError, KeyError) as e:
@@ -155,7 +161,7 @@ def get_tool_description(unique_identifier: str, chain_config: str = "gnosis") -
         agent_id=agent_id,
         ledger_api=ledger_api,
         agent_registry_contract=mech_config.agent_registry_contract,
-        contract_abi_url=mech_config.contract_abi_url,
+        contract_abi_path=AGENT_REGISTRY_ABI_PATH,
         include_metadata=True,
     )
     if isinstance(tools_result, tuple) and len(tools_result) == 2:
@@ -188,7 +194,7 @@ def get_tool_io_schema(
         agent_id=agent_id,
         ledger_api=ledger_api,
         agent_registry_contract=mech_config.agent_registry_contract,
-        contract_abi_url=mech_config.contract_abi_url,
+        contract_abi_path=AGENT_REGISTRY_ABI_PATH,
         include_metadata=True,
     )
     if isinstance(tools_result, tuple) and len(tools_result) == 2:

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