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

mech_client/cli.py

@@ -22,6 +22,7 @@ import json
 from typing import Any, Dict, List, Optional, Tuple
 
 import click
+from click import ClickException
 from tabulate import tabulate  # type: ignore
 
 from mech_client import __version__
@@ -38,6 +39,9 @@ from mech_client.mech_tool_management import (
 from mech_client.prompt_to_ipfs import main as prompt_to_ipfs_main
 from mech_client.push_to_ipfs import main as push_to_ipfs_main
 from mech_client.to_png import main as to_png_main
+from scripts.deposit_native import main as deposit_native_main
+from scripts.deposit_token import main as deposit_token_main
+from scripts.nvm_subscribe import main as nvm_subscribe_main
 
 
 @click.group(name="mechx")  # type: ignore
@@ -47,7 +51,13 @@ def cli() -> None:
 
 
 @click.command()
-@click.argument("prompt")
+@click.option(
+    "--prompts",
+    type=str,
+    multiple=True,
+    required=True,
+    help="One or more prompts to send as a request. Can be repeated.",
+)
 @click.option("--agent_id", type=int, help="Id of the agent to be used")
 @click.option(
     "--priority-mech",
@@ -70,9 +80,10 @@ def cli() -> None:
     help="Path to private key to use for request minting",
 )
 @click.option(
-    "--tool",
+    "--tools",
     type=str,
-    help="Name of the tool to be used",
+    multiple=True,
+    help="One or more tools to be used. Can be repeated.",
 )
 @click.option(
     "--extra-attribute",
@@ -109,13 +120,13 @@ def cli() -> None:
     help="Id of the mech's chain configuration (stored configs/mechs.json)",
 )
 def interact(  # pylint: disable=too-many-arguments,too-many-locals
-    prompt: str,
+    prompts: tuple,
     agent_id: int,
     priority_mech: str,
     use_prepaid: bool,
     use_offchain: bool,
     key: Optional[str],
-    tool: Optional[str],
+    tools: Optional[tuple],
     extra_attribute: Optional[List[str]] = None,
     confirm: Optional[str] = None,
     retries: Optional[int] = None,
@@ -135,13 +146,18 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
         use_prepaid = use_prepaid or use_offchain
 
         if agent_id is None:
+            if len(prompts) != len(tools):
+                raise ClickException(
+                    f"The number of prompts ({len(prompts)}) must match the number of tools ({len(tools)})"
+                )
+
             marketplace_interact_(
-                prompt=prompt,
+                prompts=prompts,
                 priority_mech=priority_mech,
                 use_prepaid=use_prepaid,
                 use_offchain=use_offchain,
                 private_key_path=key,
-                tool=tool,
+                tools=tools,
                 extra_attributes=extra_attributes_dict,
                 confirmation_type=(
                     ConfirmationType(confirm)
@@ -165,11 +181,16 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
                     "Offchain model can only be used for marketplace requests"
                 )
 
+            if len(prompts) > 1:
+                raise ClickException(
+                    f"Error: Batch prompts ({len(prompts)}) not supported for legacy mechs"
+                )
+
             interact_(
-                prompt=prompt,
+                prompt=prompts[0],
                 agent_id=agent_id,
                 private_key_path=key,
-                tool=tool,
+                tool=tools[0] if tools else None,
                 extra_attributes=extra_attributes_dict,
                 confirmation_type=(
                     ConfirmationType(confirm)
@@ -182,7 +203,7 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
                 chain_config=chain_config,
             )
     except (ValueError, FileNotFoundError, Exception) as e:
-        raise click.ClickException(str(e)) from e
+        raise ClickException(str(e)) from e
 
 
 @click.command()
@@ -332,6 +353,71 @@ def tool_io_schema(tool_id: str, chain_config: str) -> None:
         click.echo(f"Network or I/O error: {str(e)}")
 
 
+@click.command(name="deposit-native")
+@click.argument("amount_to_deposit")
+@click.option(
+    "--chain-config",
+    type=str,
+    help="Id of the mech's chain configuration (stored configs/mechs.json)",
+)
+@click.option(
+    "--key",
+    type=click.Path(exists=True, file_okay=True, dir_okay=False),
+    help="Path to private key to use for deposit",
+)
+def deposit_native(
+    amount_to_deposit: str,
+    key: Optional[str],
+    chain_config: Optional[str] = None,
+) -> None:
+    """Deposits Native balance for prepaid requests."""
+    deposit_native_main(
+        amount=amount_to_deposit, private_key_path=key, chain_config=chain_config
+    )
+
+
+@click.command(name="deposit-token")
+@click.argument("amount_to_deposit")
+@click.option(
+    "--chain-config",
+    type=str,
+    help="Id of the mech's chain configuration (stored configs/mechs.json)",
+)
+@click.option(
+    "--key",
+    type=click.Path(exists=True, file_okay=True, dir_okay=False),
+    help="Path to private key to use for deposit",
+)
+def deposit_token(
+    amount_to_deposit: str,
+    key: Optional[str],
+    chain_config: Optional[str] = None,
+) -> None:
+    """Deposits Token balance for prepaid requests."""
+    deposit_token_main(
+        amount=amount_to_deposit, private_key_path=key, chain_config=chain_config
+    )
+
+
+@click.command(name="purchase-nvm-subscription")
+@click.option(
+    "--chain-config",
+    type=str,
+    help="Id of the mech's chain configuration (stored configs/mechs.json)",
+)
+@click.option(
+    "--key",
+    type=click.Path(exists=True, file_okay=True, dir_okay=False),
+    help="Path to private key to use for deposit",
+)
+def nvm_subscribe(
+    key: str,
+    chain_config: str,
+) -> None:
+    """Allows to purchase nvm subscription for nvm mech requests."""
+    nvm_subscribe_main(private_key_path=key, chain_config=chain_config)
+
+
 cli.add_command(interact)
 cli.add_command(prompt_to_ipfs)
 cli.add_command(push_to_ipfs)
@@ -339,6 +425,9 @@ cli.add_command(to_png)
 cli.add_command(tools_for_agents)
 cli.add_command(tool_io_schema)
 cli.add_command(tool_description)
+cli.add_command(deposit_native)
+cli.add_command(deposit_token)
+cli.add_command(nvm_subscribe)
 
 
 if __name__ == "__main__":

mech_client/configs/mechs.json

@@ -14,9 +14,8 @@
         },
         "gas_limit": 500000,
         "price": 10000000000000000,
-        "contract_abi_url": "https://api.gnosisscan.io/api?module=contract&action=getabi&address={contract_address}&apikey={api_key}",
         "transaction_url": "https://gnosisscan.io/tx/{transaction_digest}",
-        "subgraph_url": "https://api.studio.thegraph.com/query/57238/mech/version/latest"
+        "subgraph_url": ""
     },
     "arbitrum": {
         "agent_registry_contract": "0xa4799B083E0068732456EF45ff9fe5c683658327",
@@ -33,7 +32,6 @@
         },
         "gas_limit": 100000,
         "price": 3000000000000,
-        "contract_abi_url": "https://api.arbiscan.io/api?module=contract&action=getabi&address={contract_address}",
         "transaction_url": "https://arbiscan.io/tx/{transaction_digest}",
         "subgraph_url": ""
     },
@@ -52,7 +50,6 @@
         },
         "gas_limit": 100000,
         "price": 10000000000000000,
-        "contract_abi_url": "https://api.polygonscan.com/api?module=contract&action=getabi&address={contract_address}",
         "transaction_url": "https://polygonscan.com/tx/{transaction_digest}",
         "subgraph_url": ""
     },
@@ -71,7 +68,6 @@
         },
         "gas_limit": 500000,
         "price": 3000000000000,
-        "contract_abi_url": "https://api.basescan.org/api?module=contract&action=getabi&address={contract_address}&apikey={api_key}",
         "transaction_url": "https://basescan.org/tx/{transaction_digest}",
         "subgraph_url": ""
     },
@@ -90,7 +86,6 @@
         },
         "gas_limit": 250000,
         "price": 10000000000000000,
-        "contract_abi_url": "https://api.celoscan.io/api?module=contract&action=getabi&address={contract_address}",
         "transaction_url": "https://celoscan.io/tx/{transaction_digest}",
         "subgraph_url": ""
     },
@@ -109,7 +104,6 @@
         },
         "gas_limit": 100000,
         "price": 3000000000000,
-        "contract_abi_url": "https://api-optimistic.etherscan.io/api?module=contract&action=getabi&address={contract_address}",
         "transaction_url": "https://optimistic.etherscan.io/tx/{transaction_digest}",
         "subgraph_url": ""
     }

mech_client/interact.py

@@ -28,7 +28,6 @@ python client.py <prompt> <tool>
 import asyncio
 import json
 import os
-import sys
 import time
 import warnings
 from dataclasses import asdict, dataclass, field
@@ -56,6 +55,9 @@ from mech_client.wss import (
 
 PRIVATE_KEY_FILE_PATH = "ethereum_private_key.txt"
 MECH_CONFIGS = Path(__file__).parent / "configs" / "mechs.json"
+ABI_DIR_PATH = Path(__file__).parent / "abis"
+AGENT_REGISTRY_ABI_PATH = ABI_DIR_PATH / "AgentRegistry.json"
+AGENT_MECH_ABI_PATH = ABI_DIR_PATH / "AgentMech.json"
 
 MAX_RETRIES = 3
 WAIT_SLEEP = 3.0
@@ -122,7 +124,6 @@ class MechConfig:  # pylint: disable=too-many-instance-attributes
     wss_endpoint: str
     ledger_config: LedgerConfig
     gas_limit: int
-    contract_abi_url: str
     transaction_url: str
     subgraph_url: str
     price: int
@@ -151,10 +152,6 @@ class MechConfig:  # pylint: disable=too-many-instance-attributes
         if gas_limit:
             self.gas_limit = int(gas_limit)
 
-        contract_abi_url = os.getenv("MECHX_CONTRACT_ABI_URL")
-        if contract_abi_url:
-            self.contract_abi_url = contract_abi_url
-
         transaction_url = os.getenv("MECHX_TRANSACTION_URL")
         if transaction_url:
             self.transaction_url = transaction_url
@@ -163,13 +160,6 @@ class MechConfig:  # pylint: disable=too-many-instance-attributes
         if subgraph_url:
             self.subgraph_url = subgraph_url
 
-        api_key = os.getenv("MECHX_API_KEY")
-        if api_key:
-            updated_contract_abi_url = self.contract_abi_url.replace(
-                "{api_key}", api_key
-            )
-            self.contract_abi_url = updated_contract_abi_url
-
 
 class ConfirmationType(Enum):
     """Verification type."""
@@ -222,20 +212,10 @@ def get_event_signatures(abi: List) -> Tuple[str, str]:
     return request, deliver
 
 
-def get_abi(contract_address: str, contract_abi_url: str) -> List:
+def get_abi(contract_abi_path: Path) -> List:
     """Get contract abi"""
-    abi_request_url = contract_abi_url.format(contract_address=contract_address)
-    response = requests.get(abi_request_url).json()
-
-    if "result" in response:
-        result = response["result"]
-        try:
-            abi = json.loads(result)
-        except json.JSONDecodeError:
-            print("Error: Failed to parse 'result' field as JSON")
-            sys.exit(1)
-    else:
-        abi = response.get("abi")
+    with open(contract_abi_path, encoding="utf-8") as f:
+        abi = json.load(f)
 
     return abi if abi else []
 
@@ -306,7 +286,7 @@ def verify_or_retrieve_tool(
     agent_id: int,
     ledger_api: EthereumApi,
     agent_registry_contract: str,
-    contract_abi_url: str,
+    contract_abi_path: Path,
     tool: Optional[str] = None,
 ) -> str:
     """
@@ -318,8 +298,8 @@ def verify_or_retrieve_tool(
     :type ledger_api: EthereumApi
     :param agent_registry_contract: Agent registry contract address.
     :type agent_registry_contract: str
-    :param contract_abi_url: Block explorer URL.
-    :type contract_abi_url: str
+    :param contract_abi_path: Path to agent registry abi.
+    :type contract_abi_path: Path
     :param tool: The tool to verify or retrieve (optional).
     :type tool: Optional[str]
     :return: The result of the verification or retrieval.
@@ -330,7 +310,7 @@ def verify_or_retrieve_tool(
         agent_id=agent_id,
         ledger_api=ledger_api,
         agent_registry_contract=agent_registry_contract,
-        contract_abi_url=contract_abi_url,
+        contract_abi_path=contract_abi_path,
         include_metadata=False,  # Ensure this is False to only get the list of tools
     )
     # Ensure only the list of tools is used
@@ -348,13 +328,13 @@ def fetch_tools(
     agent_id: int,
     ledger_api: EthereumApi,
     agent_registry_contract: str,
-    contract_abi_url: str,
+    contract_abi_path: Path,
     include_metadata: bool = False,
 ) -> Union[List[str], Tuple[List[str], Dict[str, Any]]]:
     """Fetch tools for specified agent ID, optionally include metadata."""
     mech_registry = get_contract(
         contract_address=agent_registry_contract,
-        abi=get_abi(agent_registry_contract, contract_abi_url),
+        abi=get_abi(contract_abi_path),
         ledger_api=ledger_api,
     )
     token_uri = mech_registry.functions.tokenURI(agent_id).call()
@@ -577,8 +557,6 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
     ledger_config = mech_config.ledger_config
     contract_address = query_agent_address(
         agent_id=agent_id,
-        timeout=timeout,
-        url=mech_config.subgraph_url,
         chain_config=chain_config,
     )
     if contract_address is None:
@@ -599,12 +577,9 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
         ledger_api=ledger_api,
         tool=tool,
         agent_registry_contract=mech_config.agent_registry_contract,
-        contract_abi_url=mech_config.contract_abi_url,
-    )
-    abi = get_abi(
-        contract_address=contract_address,
-        contract_abi_url=mech_config.contract_abi_url,
+        contract_abi_path=AGENT_REGISTRY_ABI_PATH,
     )
+    abi = get_abi(AGENT_MECH_ABI_PATH)
     mech_contract = get_contract(
         contract_address=contract_address, abi=abi, ledger_api=ledger_api
     )